diff --git a/Makefile b/Makefile
index 667d8c2..8ac9d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,14 @@ deb-only:
 	fakeroot alien -g --scripts $(OUTPUT_DIR)/rpmbuild/tmp.rpm
 	rm -r $(OUTPUT_DIR)/rpmbuild
 	rm -rf $(OUTPUT_DIR)/*.orig
-	sed -i 's/Depends:.*/Depends: $${shlibs:Depends}, php7.3, php7.3-xmlrpc, php7.3-pdo, php7.3-mysqlnd, php7.3-mbstring, php7.3-sqlite3/g' $(OUTPUT_DIR)/bc-flexisip-account-manager*/debian/control
-	cd `ls -rt $(OUTPUT_DIR) | tail -1` && dpkg-buildpackage
+	sed -i 's/Depends:.*/Depends: $${shlibs:Depends}, php, php-xmlrpc, php-pdo, php-mysqlnd, php-mbstring, php-sqlite3/g' $(OUTPUT_DIR)/bc-flexisip-account-manager*/debian/control
+	cd `ls -rt $(OUTPUT_DIR) | tail -1` && dpkg-buildpackage --no-sign
 	@echo "== DEB Package Created =="
 
+	# Cleanup
+	ls -d */ | cut -f1 -d'/' | grep bc-flexisip-account-manager | xargs rm -rf
+	ls bc-flexisip-account-manager* | grep -v deb | xargs rm
+
 rpm: prepare package-common rpm-only package-end-common
 rpm-dev: prepare-dev package-common rpm-only package-end-common
 deb: prepare package-common deb-only package-end-common
diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 6cd9612..e0f227b 100644
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@@ -44,11 +44,7 @@ Source0:        flexisip-account-manager.tar.gz
 #BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # dependencies
-%if %{with deb}
-Requires:
-%else
 Requires:       rh-php73-php rh-php73-php-xmlrpc rh-php73-php-pdo rh-php73-php-mysqlnd rh-php73-php-mbstring
-%endif
 
 %description
 PHP server for Linphone and Flexisip providing module for account creation.
@@ -82,6 +78,23 @@ cp -R conf/* "$RPM_BUILD_ROOT/etc/flexisip-account-manager/"
 %if %{without deb}
     if [ $1 -eq 1 ] ; then
 %endif
+
+    # Create the var directory if it doesn't exists
+    if [ ! -d "%{var_dir}" ]; then
+        # FlexiAPI logs file
+        mkdir -p %{var_dir}/log/flexiapi
+
+        # FlexiAPI base directories setup and rights
+        mkdir -p %{var_dir}/flexiapi/storage/app/public
+        mkdir -p %{var_dir}/flexiapi/storage/framework/cache
+        mkdir -p %{var_dir}/flexiapi/storage/framework/sessions
+        mkdir -p %{var_dir}/flexiapi/storage/framework/testing
+        mkdir -p %{var_dir}/flexiapi/storage/framework/views
+        mkdir -p %{var_dir}/flexiapi/bootstrap/cache
+        touch %{var_dir}/flexiapi/storage/db.sqlite
+        touch %{var_dir}/flexiapi/storage/external.db.sqlite
+    fi
+
     mkdir -p %{var_dir}/log
     touch %{var_dir}/log/account-manager.log
     chown %{web_user}:%{web_user} %{var_dir}/log/account-manager.log
@@ -94,26 +107,15 @@ cp -R conf/* "$RPM_BUILD_ROOT/etc/flexisip-account-manager/"
     setsebool -P httpd_can_network_connect_db on
 %endif
 
-    if ! test -f %{env_symlink_file}; then
-        # FlexiAPI logs file
-        mkdir -p %{var_dir}/log/flexiapi
-        chown -R %{web_user}:%{web_user} %{var_dir}/log
-
-        # FlexiAPI base directories setup and rights
-        mkdir -p %{var_dir}/flexiapi/storage/app/public
-        mkdir -p %{var_dir}/flexiapi/storage/framework/cache %{var_dir}/flexiapi/storage/framework/sessions %{var_dir}/flexiapi/storage/framework/testing %{var_dir}/flexiapi/storage/framework/views
-        mkdir -p %{opt_dir}/flexiapi/bootstrap/cache
-        touch %{var_dir}/flexiapi/storage/db.sqlite
-        touch %{var_dir}/flexiapi/storage/external.db.sqlite
-
-        ln -s %{var_dir}/log/flexiapi %{var_dir}/flexiapi/storage/logs
-        ln -s %{var_dir}/flexiapi/storage %{opt_dir}/flexiapi/.
-    fi
-
+    chown -R %{web_user}:%{web_user} %{var_dir}/log
     chown -R %{web_user}:%{web_user} %{var_dir}/flexiapi/storage
-    chown -R %{web_user}:%{web_user} %{opt_dir}/flexiapi/storage
+    chown -R %{web_user}:%{web_user} %{var_dir}/flexiapi/bootstrap
     chown -R %{web_user}:%{web_user} %{var_dir}/log/flexiapi
 
+    # Forces the creation of the symbolic links event if they already exists
+    ln -sf %{var_dir}/log/flexiapi %{var_dir}/flexiapi/storage/logs
+    ln -sf %{var_dir}/flexiapi/storage %{opt_dir}/flexiapi/.
+
     # FlexiAPI env file configuration
     if ! test -f %{env_config_file}; then
         cd %{opt_dir}/flexiapi/
@@ -131,8 +133,10 @@ cp -R conf/* "$RPM_BUILD_ROOT/etc/flexisip-account-manager/"
         %endif
     fi
 
-    # Check if there is a migration
+    # Link it once more
+    ln -sf %{env_config_file} %{env_symlink_file}
 
+    # Check if there is a migration
     if cd %{opt_dir}/flexiapi/ && php artisan migrate:status | grep -q No; then
         echo " "
         echo "You need to migrate the database to finish the setup:"
@@ -149,10 +153,6 @@ cp -R conf/* "$RPM_BUILD_ROOT/etc/flexisip-account-manager/"
 fi
 %endif
 
-%postun
-
-rm -rf %{var_dir}
-
 # FILES
 
 %files
@@ -166,6 +166,8 @@ rm -rf %{var_dir}
 %{opt_dir}/xmlrpc/*.php
 %{opt_dir}/README*
 
+%exclude %{opt_dir}/flexiapi/storage/
+
 %config(noreplace) /etc/flexisip-account-manager/*.conf
 
 %if %{with deb}