diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh
index 553383a..856b48a 100755
--- a/rootfs/root/docker/setup/01-system.sh
+++ b/rootfs/root/docker/setup/01-system.sh
@@ -24,18 +24,10 @@ set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-update_conf_files="$(find '/etc' -iname '*.pacnew')"
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-if [ -n "$update_conf_files" ]; then
-  for conf in $update_conf_files; do
-    name="${conf//.pacnew/}"
-    mv -f "$conf" "$name"
-  done
-fi
-if grep -Rsqi 'DisableSandbox' /etc/pacman.conf*; then
-  sed -i 's|.*DisableSandbox|DisableSandbox|g' /etc/pacman.conf*
-fi
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?
diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh
index 94adf9c..b7667f5 100755
--- a/rootfs/root/docker/setup/03-files.sh
+++ b/rootfs/root/docker/setup/03-files.sh
@@ -24,10 +24,15 @@ set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-
+update_conf_files="$(find '/etc' -iname '*.pacnew')"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-
+if [ -n "$update_conf_files" ]; then
+  for conf in $update_conf_files; do
+    name="${conf//.pacnew/}"
+    mv -f "$conf" "$name"
+  done
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?
diff --git a/rootfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh
index ea65009..d701e91 100755
--- a/rootfs/root/docker/setup/06-post.sh
+++ b/rootfs/root/docker/setup/06-post.sh
@@ -27,7 +27,9 @@ exitCode=0
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-
+if grep -Rsqi 'DisableSandbox' /etc/pacman.conf*; then
+  sed -i 's|.*DisableSandbox|DisableSandbox|g' /etc/pacman.conf*
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?