diff --git a/overlay/entrypoint.sh b/overlay/entrypoint.sh
index 928bf89..867edb7 100644
--- a/overlay/entrypoint.sh
+++ b/overlay/entrypoint.sh
@@ -52,9 +52,6 @@ for user_init_script in ${USER_HOME}/init.d/*.sh ; do
 
 done
 
-# Ensure all scripts are executable
-chmod a+rwx /opt/scripts/*.sh
-
 # Start supervisord
 echo
 echo "**** Starting supervisord ****";
diff --git a/overlay/opt/scripts/drop_caches.sh b/overlay/usr/bin/drop_caches.sh
similarity index 100%
rename from overlay/opt/scripts/drop_caches.sh
rename to overlay/usr/bin/drop_caches.sh
diff --git a/overlay/opt/scripts/install_firefox.sh b/overlay/usr/bin/install_firefox.sh
similarity index 100%
rename from overlay/opt/scripts/install_firefox.sh
rename to overlay/usr/bin/install_firefox.sh
diff --git a/overlay/opt/scripts/install_protonup.sh b/overlay/usr/bin/install_protonup.sh
similarity index 100%
rename from overlay/opt/scripts/install_protonup.sh
rename to overlay/usr/bin/install_protonup.sh
diff --git a/overlay/opt/scripts/install_sunshine.sh b/overlay/usr/bin/install_sunshine.sh
similarity index 100%
rename from overlay/opt/scripts/install_sunshine.sh
rename to overlay/usr/bin/install_sunshine.sh
diff --git a/overlay/usr/bin/start-desktop.sh b/overlay/usr/bin/start-desktop.sh
index 7270f3f..a86505a 100755
--- a/overlay/usr/bin/start-desktop.sh
+++ b/overlay/usr/bin/start-desktop.sh
@@ -28,9 +28,9 @@ wait_for_x
 # Install/Upgrade user apps
 if [[ ! -f /tmp/.desktop-apps-updated.lock ]]; then
     xterm -geometry 200x50+0+0 -ls -e /bin/bash -c "
-        source /opt/scripts/install_firefox.sh;
-        source /opt/scripts/install_protonup.sh;
-        source /opt/scripts/install_sunshine.sh;
+        source /usr/bin/install_firefox.sh;
+        source /usr/bin/install_protonup.sh;
+        source /usr/bin/install_sunshine.sh;
         sleep 1;
     "
     touch /tmp/.desktop-apps-updated.lock