diff --git a/pkg.info b/pkg.info
index 1e1891b..0a262a1 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: ufw
 description: Uncomplicated Firewall
 version: 0.36.2
-revision: 1
+revision: 2
 url: https://launchpad.net/ufw
 license: GPL3
 architecture: any
@@ -14,3 +14,8 @@ depends:
   - python3
 make_depends:
   - python-setuptools
+downloads:
+  - url: https://launchpad.net/ufw/${BPM_PKG_VERSION%.*}/${BPM_PKG_VERSION}/+download/ufw-${BPM_PKG_VERSION}.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 2a57a99eecef6b44db3537ed2520b30bae3759f8465456e22e404cd643838bf5
diff --git a/source-files/ufw.esv b/source-files/ufw.esv
index 1a779a6..739c25c 100644
--- a/source-files/ufw.esv
+++ b/source-files/ufw.esv
@@ -1,5 +1,6 @@
 name: ufw
-description: Start the Uncomplicated FireWall
-type: background
-start_cmd: /etc/esvm/scripts/ufw.sh
-exit_method: kill
+description: Manage the Uncomplicated FireWall
+type: simple
+start_cmd: ufw enable
+stop_cmd: ufw disable
+exit_method: stop_command
diff --git a/source-files/ufw.sh b/source-files/ufw.sh
deleted file mode 100755
index 6c6b7cc..0000000
--- a/source-files/ufw.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-stop() {
-	ufw disable
-
-	# Clear the trap
-    trap - SIGINT SIGTERM
-    kill -- -$(pgrep iptables.sh)
-}
-
-ufw enable
-
-# Run stop function when SIGINT or SIGTERM signals are caught
-trap "stop $1" SIGINT SIGTERM
-sleep infinity
-
-
diff --git a/source.sh b/source.sh
index de20741..4eb8e95 100644
--- a/source.sh
+++ b/source.sh
@@ -2,16 +2,6 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://launchpad.net/ufw/${BPM_PKG_VERSION%.*}/${BPM_PKG_VERSION}/+download/ufw-${BPM_PKG_VERSION}.tar.gz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
@@ -25,7 +15,6 @@ package() {
 
   # Install esvm service
   install -Dm644 "$BPM_WORKDIR"/ufw.esv "$BPM_OUTPUT"/etc/esvm/services/ufw.esv
-  install -Dm755 "$BPM_WORKDIR"/ufw.sh "$BPM_OUTPUT"/etc/esvm/scripts/ufw.sh
 
   # Install package license
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/ufw/COPYING