diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index eb588e25c9..d903b737e4 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -32,6 +32,7 @@ jobs:
           sudo apt-get install gettext
           pip3 install invoke
           invoke install
+          invoke static
       - name: Coverage Tests
         run: |
           invoke coverage
diff --git a/docker/nginx.conf b/docker/nginx.conf
index ace56165aa..7f275b4fa8 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -27,6 +27,11 @@ server {
     location /static/ {
         alias /var/www/static/;
         autoindex on;
+
+        # Caching settings
+        expires 30d;
+        add_header Pragma public;
+        add_header Cache-Control "public";
     }
 
 }
\ No newline at end of file
diff --git a/docker/start_dev_server.sh b/docker/start_dev_server.sh
index 703d577ed5..481da3c31a 100644
--- a/docker/start_dev_server.sh
+++ b/docker/start_dev_server.sh
@@ -39,6 +39,7 @@ echo "Running InvenTree database migrations and collecting static files..."
 python manage.py check || exit 1
 python manage.py migrate --noinput || exit 1
 python manage.py migrate --run-syncdb || exit 1
+python manage.py prerender || exit 1
 python manage.py collectstatic --noinput || exit 1
 python manage.py clearsessions || exit 1
 
diff --git a/docker/start_prod_server.sh b/docker/start_prod_server.sh
index 1fc8f6d111..811e189d13 100644
--- a/docker/start_prod_server.sh
+++ b/docker/start_prod_server.sh
@@ -39,6 +39,7 @@ echo "Running InvenTree database migrations and collecting static files..."
 python manage.py check || exit 1
 python manage.py migrate --noinput || exit 1
 python manage.py migrate --run-syncdb || exit 1
+python manage.py prerender || exit 1
 python manage.py collectstatic --noinput || exit 1
 python manage.py clearsessions || exit 1