diff --git a/manifest.json b/manifest.json
index 6ad7106..883d6b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
     "description": {
         "en": "Offers a user experience similar to virtual machines but using Linux containers instead."
     },
-    "version": "4.21~ynh1",
+    "version": "4.21~ynh2",
     "url": "https://example.com",
     "license": "Apache-2.0",
     "maintainer": {
diff --git a/scripts/backup b/scripts/backup
index 3328385..68d5336 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -50,9 +50,12 @@ ynh_backup --src_path="/var/log/$app/"
 
 ynh_backup --src_path="/usr/local/lib/$app/"
 
+ynh_backup --src_path="/usr/local/bin/fuidshift"
 ynh_backup --src_path="/usr/local/bin/lxc"
-ynh_backup --src_path="/usr/local/bin/lxd"
 ynh_backup --src_path="/usr/local/bin/lxc-to-lxd"
+ynh_backup --src_path="/usr/local/bin/lxd"
+ynh_backup --src_path="/usr/local/bin/lxd-agent"
+ynh_backup --src_path="/usr/local/bin/lxd-benchmark"
 ynh_backup --src_path="/usr/local/bin/lxd-p2c"
 ynh_backup --src_path="/etc/bash_completion.d/lxd-client"
 
diff --git a/scripts/install b/scripts/install
index 6132685..3beab44 100755
--- a/scripts/install
+++ b/scripts/install
@@ -78,7 +78,7 @@ ynh_exec_warn_less make
 mkdir -p /usr/local/lib/$app
 mkdir -p /var/log/$app
 cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
-cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin
+cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin
 cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
 popd
 
diff --git a/scripts/remove b/scripts/remove
index e3b5630..9e35a2c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -72,14 +72,21 @@ ynh_secure_remove --file="/usr/local/lib/$app"
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
+ynh_secure_remove --file="/usr/local/bin/fuidshift"
 ynh_secure_remove --file="/usr/local/bin/lxc"
-ynh_secure_remove --file="/usr/local/bin/lxd"
 ynh_secure_remove --file="/usr/local/bin/lxc-to-lxd"
+ynh_secure_remove --file="/usr/local/bin/lxd"
+ynh_secure_remove --file="/usr/local/bin/lxd-agent"
+ynh_secure_remove --file="/usr/local/bin/lxd-benchmark"
 ynh_secure_remove --file="/usr/local/bin/lxd-p2c"
 ynh_secure_remove --file="/etc/bash_completion.d/lxd-client"
 
 sed -i "/# Added by lxd$/{N;/root:100000:65536/d}" /etc/sub{u,g}id
 
+ynh_secure_remove --file="/etc/dnsmasq.d/lxd"
+
+systemctl restart dnsmasq
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 91863b1..ad88a27 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -72,9 +72,12 @@ ynh_restore_file --origin_path="/var/log/$app/"
 
 ynh_restore_file --origin_path="/usr/local/lib/$app/"
 
+ynh_restore_file --origin_path="/usr/local/bin/fuidshift"
 ynh_restore_file --origin_path="/usr/local/bin/lxc"
-ynh_restore_file --origin_path="/usr/local/bin/lxd"
 ynh_restore_file --origin_path="/usr/local/bin/lxc-to-lxd"
+ynh_restore_file --origin_path="/usr/local/bin/lxd"
+ynh_restore_file --origin_path="/usr/local/bin/lxd-agent"
+ynh_restore_file --origin_path="/usr/local/bin/lxd-benchmark"
 ynh_restore_file --origin_path="/usr/local/bin/lxd-p2c"
 ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 58a2519..4b660e9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -96,7 +96,7 @@ ynh_exec_warn_less make
 mkdir -p /usr/local/lib/$app
 mkdir -p /var/log/$app
 cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
-cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin
+cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin
 cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
 popd