diff --git a/prepare_server.sh b/prepare_server.sh
index ad53ff92..100d6336 100755
--- a/prepare_server.sh
+++ b/prepare_server.sh
@@ -75,5 +75,5 @@ fi
 if [ "$START_BACKGROUND" = true ]; then
     python3 server/manage.py runserver "${DJANGO_PORT}" --settings="$DJANGO_SETTINGS_MODULE" > /dev/null &
 else
-    python3 server/manage.py runserver "${DJANGO_PORT}" --settings="$DJANGO_SETTINGS_MODULE"
+    cd server && python3 manage.py runserver "${DJANGO_PORT}" --settings="$DJANGO_SETTINGS_MODULE"
 fi
diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index fac8ad73..e0699943 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -580,10 +580,7 @@ if APP_ENVIRONMENT == "development":
     # django-extensions
     # ------------------------------------------------------------------------------
     # https://django-extensions.readthedocs.io/en/latest/installation_instructions.html#configuration
-    INSTALLED_APPS += [
-        "django_extensions",
-        # "django_watchfiles"
-    ]  # noqa F405
+    INSTALLED_APPS += ["django_extensions", "django_watchfiles"]  # noqa F405
 
 if APP_ENVIRONMENT in ["production", "caprover"] or APP_ENVIRONMENT.startswith(
     "caprover"