diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2
index 06ffe6964f..510d8b08cc 100755
--- a/scripts/lib/upgrade-zulip-stage-2
+++ b/scripts/lib/upgrade-zulip-stage-2
@@ -107,7 +107,7 @@ def shutdown_server() -> None:
     ]
     worker_services = ["zulip-workers:*"]
     # Stop and start thumbor service only if thumbor is installed.
-    if os.path.exists("/etc/supervisor/conf.d/thumbor.conf"):
+    if os.path.exists("/etc/supervisor/conf.d/zulip/thumbor.conf"):
         core_server_services.append("zulip-thumbor")
 
     logging.info("Stopping Zulip...")
@@ -275,7 +275,7 @@ if not args.skip_migrations:
 
 # Now we start shutting down services; we start with
 # process-fts-updates, which isn't on the critical serving path.
-if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"):
+if os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf"):
     subprocess.check_call(["supervisorctl", "stop", "process-fts-updates"], preexec_fn=su_to_zulip)
 
 if (not args.skip_puppet or migrations_needed) and IS_SERVER_UP:
diff --git a/scripts/restart-server b/scripts/restart-server
index 57b005b944..d12909f9b6 100755
--- a/scripts/restart-server
+++ b/scripts/restart-server
@@ -43,7 +43,7 @@ if args.fill_cache:
     subprocess.check_call(["./manage.py", "fill_memcached_caches"])
 
 core_server_services = ["zulip-django"]
-if os.path.exists("/etc/supervisor/conf.d/thumbor.conf"):
+if os.path.exists("/etc/supervisor/conf.d/zulip/thumbor.conf"):
     core_server_services.append("zulip-thumbor")
 
 current_symlink = os.path.join(DEPLOYMENTS_DIR, "current")
@@ -89,7 +89,7 @@ if using_sso.strip() == b"True":
     logging.info("Restarting Apache WSGI process...")
     subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"])
 
-if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"):
+if os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf"):
     subprocess.check_call(["supervisorctl", "restart", "process-fts-updates"])
 
 logging.info("Done!")