diff --git a/data/hooks/conf_regen/01-yunohost b/data/hooks/conf_regen/01-yunohost
index 445faa5a4..7a852db5f 100755
--- a/data/hooks/conf_regen/01-yunohost
+++ b/data/hooks/conf_regen/01-yunohost
@@ -55,6 +55,15 @@ do_init_regen() {
   mkdir -p /var/cache/yunohost/repo
   chown root:root /var/cache/yunohost
   chmod 700 /var/cache/yunohost
+
+  cp yunoprompt.service /etc/systemd/system/yunoprompt.service
+  cp dpkg-origins /etc/dpkg/origins/yunohost
+
+  # Change dpkg vendor
+  # see https://wiki.debian.org/Derivatives/Guidelines#Vendor
+  readlink -f /etc/dpkg/origins/default | grep -q debian \
+    && rm -f /etc/dpkg/origins/default \
+    && ln -s /etc/dpkg/origins/yunohost /etc/dpkg/origins/default
 }
 
 do_pre_regen() {
@@ -66,6 +75,7 @@ do_pre_regen() {
   touch /etc/yunohost/services.yml
   yunohost tools shell -c "from yunohost.service import _get_services, _save_services; _save_services(_get_services())"
 
+  mkdir -p $pending_dir/etc/systemd/system
   mkdir -p $pending_dir/etc/cron.d/
   mkdir -p $pending_dir/etc/cron.daily/
 
@@ -131,8 +141,9 @@ HandleLidSwitch=ignore
 HandleLidSwitchDocked=ignore
 HandleLidSwitchExternalPower=ignore
 EOF
-  
-  mkdir -p ${pending_dir}/etc/systemd/
+
+  cp yunoprompt.service ${pending_dir}/etc/systemd/system/yunoprompt.service
+
   if [[ "$(yunohost settings get 'security.experimental.enabled')" == "True" ]]
   then
       cp proc-hidepid.service ${pending_dir}/etc/systemd/system/proc-hidepid.service
@@ -140,6 +151,8 @@ EOF
       touch ${pending_dir}/etc/systemd/system/proc-hidepid.service
   fi
 
+  cp dpkg-origins ${pending_dir}/etc/dpkg/origins/yunohost
+
 }
 
 do_post_regen() {
@@ -203,12 +216,24 @@ do_post_regen() {
   [[ ! "$regen_conf_files" =~ "ntp.service.d/ynh-override.conf" ]] || { systemctl daemon-reload; systemctl restart ntp; }
   [[ ! "$regen_conf_files" =~ "nftables.service.d/ynh-override.conf" ]] || systemctl daemon-reload
   [[ ! "$regen_conf_files" =~ "login.conf.d/ynh-override.conf" ]] || systemctl daemon-reload
+  if [[ "$regen_conf_files" =~ "yunoprompt.service" ]]
+  then
+    systemctl daemon-reload
+    action=$([[ -e /etc/systemd/system/yunoprompt.service ]] && echo 'enable' || echo 'disable')
+    systemctl $action yunoprompt --quiet --now
+  fi
   if [[ "$regen_conf_files" =~ "proc-hidepid.service" ]]
   then
     systemctl daemon-reload
     action=$([[ -e /etc/systemd/system/proc-hidepid.service ]] && echo 'enable' || echo 'disable')
     systemctl $action proc-hidepid --quiet --now
   fi
+
+  # Change dpkg vendor
+  # see https://wiki.debian.org/Derivatives/Guidelines#Vendor
+  readlink -f /etc/dpkg/origins/default | grep -q debian \
+    && rm -f /etc/dpkg/origins/default \
+    && ln -s /etc/dpkg/origins/yunohost /etc/dpkg/origins/default
 }
 
 FORCE=${2:-0}
diff --git a/data/other/dpkg-origins/yunohost b/data/templates/yunohost/dpkg-origins
similarity index 100%
rename from data/other/dpkg-origins/yunohost
rename to data/templates/yunohost/dpkg-origins
diff --git a/data/other/yunoprompt.service b/data/templates/yunohost/yunoprompt.service
similarity index 100%
rename from data/other/yunoprompt.service
rename to data/templates/yunohost/yunoprompt.service
diff --git a/debian/install b/debian/install
index a653a40ba..8c6ba01dd 100644
--- a/debian/install
+++ b/debian/install
@@ -1,20 +1,8 @@
 bin/* /usr/bin/
 sbin/* /usr/sbin/
+data/* /usr/share/yunohost/
 data/bash-completion.d/yunohost /etc/bash_completion.d/
 doc/yunohost.8.gz /usr/share/man/man8/
-data/actionsmap/* /usr/share/moulinette/actionsmap/
-data/hooks/* /usr/share/yunohost/hooks/
-data/other/yunoprompt.service /etc/systemd/system/
-data/other/password/* /usr/share/yunohost/other/password/
-data/other/dpkg-origins/yunohost /etc/dpkg/origins
-data/other/dnsbl_list.yml /usr/share/yunohost/other/
-data/other/config_domain.toml /usr/share/yunohost/other/
-data/other/registrar_list.toml /usr/share/yunohost/other/
-data/other/ffdhe2048.pem /usr/share/yunohost/other/
-data/other/* /usr/share/yunohost/yunohost-config/moulinette/
-data/templates/* /usr/share/yunohost/templates/
-data/helpers /usr/share/yunohost/
-data/helpers.d/* /usr/share/yunohost/helpers.d/
 lib/metronome/modules/* /usr/lib/metronome/modules/
 locales/* /usr/lib/moulinette/yunohost/locales/
 src/yunohost /usr/lib/moulinette
diff --git a/debian/postinst b/debian/postinst
index 8fc00bbe2..ceeed3cdf 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,6 +5,9 @@ set -e
 do_configure() {
   rm -rf /var/cache/moulinette/*
 
+  mkdir -p /usr/share/moulinette/actionsmap/
+  ln -sf /usr/share/yunohost/actionsmap/yunohost.yml /usr/share/moulinette/actionsmap/yunohost.yml
+
   if [ ! -f /etc/yunohost/installed ]; then
       # If apps/ is not empty, we're probably already installed in the past and
       # something funky happened ...
@@ -31,14 +34,6 @@ do_configure() {
       yunohost diagnosis run --force
   fi
 
-  # Change dpkg vendor
-  # see https://wiki.debian.org/Derivatives/Guidelines#Vendor
-  readlink -f /etc/dpkg/origins/default | grep -q debian \
-    && rm -f /etc/dpkg/origins/default \
-    && ln -s /etc/dpkg/origins/yunohost /etc/dpkg/origins/default
-
-  # Yunoprompt
-  systemctl enable yunoprompt.service
 }
 
 # summary of how this script can be called: