diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh
index 856b48a..553383a 100755
--- a/rootfs/root/docker/setup/01-system.sh
+++ b/rootfs/root/docker/setup/01-system.sh
@@ -24,10 +24,18 @@ 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=$?