diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index f689862d6d7..12478e132a1 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -22,8 +22,8 @@
 /var/cache/cloudstack/management/work
 /var/cache/cloudstack/management/temp
 /var/log/cloudstack/management
-/var/lib/cloud/mnt
-/var/lib/cloud/management
+/var/lib/cloudstack/mnt
+/var/lib/cloudstack/management
 /usr/bin/cloud-update-xenserver-licenses
 /usr/bin/cloud-setup-management
 /usr/bin/cloud-setup-databases
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index 6fe01453c10..5b6b4b351c3 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -18,9 +18,9 @@
 
 if [ "$1" = configure ]; then
     if ! getent passwd cloud >/dev/null; then
-        adduser --quiet --system --group --no-create-home --home /usr/share/cloudstack-manager cloud
+        adduser --quiet --system --group --no-create-home --home /var/lib/cloudstack/management cloud
+    else
+        usermod -m /var/lib/cloudstack/management cloud
     fi
     chown cloud /var/log/cloudstack/management
 fi
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index ba9056e70a2..cf950d1bd04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,10 +54,8 @@ install:
 	mkdir -p debian/tmp$(SYSCONFDIR)/init.d
 	mkdir -p debian/tmp/var/cache/$(PACKAGE)
 	mkdir -p debian/tmp/var/log/$(PACKAGE)
-	mkdir -p debian/tmp/var/lib/cloud
+	mkdir -p debian/tmp/var/lib/$(PACKAGE)
 	mkdir -p debian/tmp/usr/bin
-	mkdir -p debian/tmp/usr/share/cloud
-	mkdir -p debian/tmp/usr/lib/cloud
 
 	# cloudstack-agent
 	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
@@ -81,8 +79,8 @@ install:
 	mkdir debian/tmp/var/cache/$(PACKAGE)/management/work
 	mkdir debian/tmp/var/cache/$(PACKAGE)/management/temp
 	mkdir debian/tmp/var/log/$(PACKAGE)/ipallocator
-	mkdir debian/tmp/var/lib/cloud/management
-	mkdir debian/tmp/var/lib/cloud/mnt
+	mkdir debian/tmp/var/lib/$(PACKAGE)/management
+	mkdir debian/tmp/var/lib/$(PACKAGE)/mnt
 	cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/$(PACKAGE)-management/setup/
 	cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* debian/tmp/usr/share/$(PACKAGE)-management/webapps/client/
 	cp server/target/conf/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/server/