diff --git a/.gitignore b/.gitignore
index 005984e..280fb6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /data/*
 /data/logs/*
 /data/tls/*
-/data/static/*
+/data/django_static/*
 /data/profilepictures/*
 /data/archive/*
 !/data/logs/
diff --git a/data/Caddyfile b/data/Caddyfile
index c5bbc58..84f30f3 100644
--- a/data/Caddyfile
+++ b/data/Caddyfile
@@ -17,7 +17,11 @@
 		}
 		# static files
 		file_server /static/* {
-			root {$DATADIR}/static/..
+			root {$ROOTDIR}
+		}
+		# django static files
+		file_server /django_static/* {
+			root {$DATADIR}/django_static/..
 		}
 		# favicon
 		redir /favicon.ico /static/favicon.ico
diff --git a/project/settings.py b/project/settings.py
index a5362ca..56ff5fb 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -149,8 +149,8 @@ LOCALE_PATHS = [
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.1/howto/static-files/
 
-STATIC_URL = "static/"
-STATIC_ROOT = BASE_DIR / "data" / "static"
+STATIC_URL = "django_static/"
+STATIC_ROOT = BASE_DIR / "data" / "django_static"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
diff --git a/scripts/_bootstrap.py b/scripts/_bootstrap.py
index 142781e..7cdee55 100755
--- a/scripts/_bootstrap.py
+++ b/scripts/_bootstrap.py
@@ -131,6 +131,7 @@ if __name__ == "__main__":
         ["./venv/bin/python3", "./manage.py", "migrate", "--noinput"], env=os.environ).wait()
     # Caddy configuration via env
     environment_caddy = os.environ
+    environment_caddy["ROOTDIR"] = str(base_directory.absolute())
     environment_caddy["DATADIR"] = str(data_directory.absolute())
     environment_caddy["CADDY_HOSTS"] = ", ".join(config["caddy"]["hosts"])
     environment_caddy["HTTP_PORT"] = str(config["caddy"]["http_port"])
diff --git a/app/static/css/main.css b/static/css/main.css
similarity index 100%
rename from app/static/css/main.css
rename to static/css/main.css
diff --git a/app/static/css/simple-keyboard.css b/static/css/simple-keyboard.css
similarity index 100%
rename from app/static/css/simple-keyboard.css
rename to static/css/simple-keyboard.css
diff --git a/app/static/css/simple-keyboard_dark.css b/static/css/simple-keyboard_dark.css
similarity index 100%
rename from app/static/css/simple-keyboard_dark.css
rename to static/css/simple-keyboard_dark.css
diff --git a/app/static/favicon.ico b/static/favicon.ico
similarity index 100%
rename from app/static/favicon.ico
rename to static/favicon.ico
diff --git a/app/static/favicon.png b/static/favicon.png
similarity index 100%
rename from app/static/favicon.png
rename to static/favicon.png
diff --git a/app/static/fonts/Inter-Bold.ttf b/static/fonts/Inter-Bold.ttf
similarity index 100%
rename from app/static/fonts/Inter-Bold.ttf
rename to static/fonts/Inter-Bold.ttf
diff --git a/app/static/fonts/Inter-Regular.ttf b/static/fonts/Inter-Regular.ttf
similarity index 100%
rename from app/static/fonts/Inter-Regular.ttf
rename to static/fonts/Inter-Regular.ttf
diff --git a/app/static/js/autoreload.js b/static/js/autoreload.js
similarity index 100%
rename from app/static/js/autoreload.js
rename to static/js/autoreload.js
diff --git a/app/static/js/custom_form.js b/static/js/custom_form.js
similarity index 100%
rename from app/static/js/custom_form.js
rename to static/js/custom_form.js
diff --git a/app/static/js/custom_number_input.js b/static/js/custom_number_input.js
similarity index 100%
rename from app/static/js/custom_number_input.js
rename to static/js/custom_number_input.js
diff --git a/app/static/js/logged_out.js b/static/js/logged_out.js
similarity index 100%
rename from app/static/js/logged_out.js
rename to static/js/logged_out.js
diff --git a/app/static/js/login.js b/static/js/login.js
similarity index 100%
rename from app/static/js/login.js
rename to static/js/login.js
diff --git a/app/static/js/main.js b/static/js/main.js
similarity index 100%
rename from app/static/js/main.js
rename to static/js/main.js
diff --git a/app/static/js/order.js b/static/js/order.js
similarity index 100%
rename from app/static/js/order.js
rename to static/js/order.js
diff --git a/app/static/js/simple-keyboard.js b/static/js/simple-keyboard.js
similarity index 100%
rename from app/static/js/simple-keyboard.js
rename to static/js/simple-keyboard.js
diff --git a/app/static/js/simple-keyboard_configure.js b/static/js/simple-keyboard_configure.js
similarity index 100%
rename from app/static/js/simple-keyboard_configure.js
rename to static/js/simple-keyboard_configure.js
diff --git a/app/static/material-icons/arrow-drop-down.svg b/static/material-icons/arrow-drop-down.svg
similarity index 100%
rename from app/static/material-icons/arrow-drop-down.svg
rename to static/material-icons/arrow-drop-down.svg
diff --git a/app/static/material-icons/menu.svg b/static/material-icons/menu.svg
similarity index 100%
rename from app/static/material-icons/menu.svg
rename to static/material-icons/menu.svg