diff --git a/pkg/deb/deb-buildsource.sh b/pkg/deb/deb-buildsource.sh
index 94b774d8e..6ac9dccaf 100755
--- a/pkg/deb/deb-buildsource.sh
+++ b/pkg/deb/deb-buildsource.sh
@@ -19,7 +19,7 @@ elif [ "$distributor" == "Ubuntu" ]; then
 fi
 codename=$(lsb_release --codename --short)
 date=$(date +%a," "%d" "%b" "%Y" "%T)
-pkg_name=keydb-pro-$version$distname
+pkg_name=keydb-pro-$majorv:$version$distname
 
 # create build tree
 cd ../../../
@@ -30,7 +30,7 @@ cp -r debian $pkg_name/tmp
 cp master_changelog $pkg_name/tmp/debian/changelog
 mv ../../../keydb-pro_$version.orig.tar.gz ./$pkg_name
 cd $pkg_name/tmp
-changelog_str="keydb-pro ($version-$build$distname) $codename; urgency=medium\n\n  * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com>  $date +0000\n\n"
+changelog_str="keydb-pro ($majorv:$version-$build$distname) $codename; urgency=medium\n\n  * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com>  $date +0000\n\n"
 if [ $# -eq 0 ]; then
         sed -i "1s/^/$changelog_str\n/" debian/changelog
 elif [ $# -eq 1 ] && [ "$1" != "None" ]; then
@@ -55,6 +55,6 @@ sudo pbuilder --build *.dsc  --logfile /mnt/pbuilderlog.log
 
 # move new packages to deb_files_generated and clean up
 cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated
-sudo pbuilder --autocleanaptcache
+sudo pbuilder clean
 cd ../
 rm -rf $pkg_name
diff --git a/pkg/deb/debian/bin/generate-systemd-service-files b/pkg/deb/debian/bin/generate-systemd-service-files
index 7778a06fb..9ee38792e 100755
--- a/pkg/deb/debian/bin/generate-systemd-service-files
+++ b/pkg/deb/debian/bin/generate-systemd-service-files
@@ -27,24 +27,26 @@ do
 			NAME="keydb"
 			BINARY_EXEC="keydb-server"
 			BINARY_NAME="keydb-pro-server"
+			TARGET_NAME="keydb-pro-server"
 			;;
 		keydb-sentinel)
 			NAME="sentinel"
 			BINARY_EXEC="keydb-sentinel"
 			BINARY_NAME="keydb-sentinel"
+			TARGET_NAME="keydb-pro-sentinel"
 			;;
 		esac
 
 		case "${MODE}" in
 		default)
 			EXTRA="Alias=${NAME}.service"
-			TARGET="debian/${BINARY}.service"
+			TARGET="debian/${TARGET_NAME}.${BINARY}.service"
 			NAMESPACED="${NAME}"
 			DESCRIPTION="Advanced key-value store"
 			;;
 		templated)
 			EXTRA=""
-			TARGET="debian/${BINARY}@.service"
+			TARGET="debian/${TARGET_NAME}.${BINARY}@.service"
 			NAMESPACED="${NAME}-%i"
 			DESCRIPTION="Advanced key-value store (%I)"
 			;;
@@ -81,8 +83,6 @@ do
 #
 #   $ systemctl start ${BINARY}@myname.service
 #   $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file
-#
-#  -- Chris Lamb <lamby@debian.org>  Mon, 09 Oct 2017 22:17:24 +0100
 EOF
 		fi
 
diff --git a/pkg/deb/debian/rules b/pkg/deb/debian/rules
index bc14ea0f6..8fff6268c 100755
--- a/pkg/deb/debian/rules
+++ b/pkg/deb/debian/rules
@@ -18,13 +18,15 @@ endif
 
 override_dh_auto_install:
 	debian/bin/generate-systemd-service-files
+	dh_installsystemd --name keydb-server --restart-after-upgrade
+	dh_installsystemd --name keydb-sentinel --restart-after-upgrade
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Avoid race conditions in upstream testsuite.
-#	./runtest --clients 1 || true
-#	./runtest-cluster || true
-#	./runtest-sentinel || true
+	./runtest || true
+	./runtest-cluster || true
+	./runtest-sentinel || true
 endif
 
 override_dh_auto_clean:
diff --git a/pkg/deb/master_changelog b/pkg/deb/master_changelog
index cb43b4537..0df2429cb 100644
--- a/pkg/deb/master_changelog
+++ b/pkg/deb/master_changelog
@@ -1,6 +1,6 @@
-keydb (6.0.7-1distribution_placeholder) codename_placeholder; urgency=medium
+keydb (6.0.8-1distribution_placeholder) codename_placeholder; urgency=medium
 
-  * 6.0.7 Updating builds from deb source package
+  * 6.0.8 Updating builds from deb source package
   * Naming conventions are now updated
   * Builds now genrated accross different distributions/architectures automatically. 
   * Same changelog used for all distribitions/architectures and will be updated on each release