diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b409aeb..b1e4881 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,7 @@ deploy-site:
     - echo "Copying to proxmox machine"
     - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/public
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find maintenance public -maxdepth 1 -printf '%p\n'; screen -S firq_dev-public -dm serve public/ -p 9000"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find maintenance public -maxdepth 1 -printf "%p\n"; screen -S firq_dev-public -dm serve public/ -p 9000'
     - echo "Website is up on https://firq.dev/"
 
 deploy-testing:
@@ -84,7 +84,7 @@ deploy-testing:
     - echo "Copying to proxmox machine"
     - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/staging
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find staging -maxdepth 1 -printf '%p\n'; screen -S firq_dev-staging -dm serve staging/ -p 9100"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find staging -maxdepth 1 -printf "%p\n"; screen -S firq_dev-staging -dm serve staging/ -p 9100'
     - echo "Staging environment is up!"
 
 unlighthouse:
@@ -123,7 +123,7 @@ unlighthouse-publish:
     - echo "Copying to proxmox machine"
     - rsync -az --stats unlighthouse-reports/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/unlighthouse
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find unlighthouse -maxdepth 1 -printf '%p\n'; screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p 9101"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find unlighthouse -maxdepth 1 -printf "%p\n"; screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p 9101'
     - echo "Unlighthouse results are up!"
 
 success_notification:
@@ -165,7 +165,7 @@ maintenance-mode:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true
     - echo "Enabeling maintenance mode"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000'
     - echo "Maintenance Website is up on https://firq.dev/"
 
 redeploy-site:
@@ -181,7 +181,7 @@ redeploy-site:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-public -dm serve firq_dev/public/ -p 9000"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-public -dm serve firq_dev/public/ -p 9000'
     - echo "Website is up on https://firq.dev/"
 
 redeploy-staging:
@@ -196,7 +196,7 @@ redeploy-staging:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-staging kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-staging -dm serve firq_dev/staging/ -p 9100"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-staging -dm serve firq_dev/staging/ -p 9100'
     - echo "Staging environment is up!"
 
 redeploy-unlighthouse:
@@ -211,7 +211,7 @@ redeploy-unlighthouse:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-unlighthouse kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-unlighthouse -dm serve firq_dev/unlighthouse/ -p 9101"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-unlighthouse -dm serve firq_dev/unlighthouse/ -p 9101'
     - echo "Staging environment is up!"
 
 maintenance-deploy:
@@ -226,5 +226,5 @@ maintenance-deploy:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true
     - echo "Enabeling maintenance mode"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000'
     - echo "Maintenance Website is up on https://firq.dev/"
diff --git a/serve.json b/serve.json
index 3eba146..6f9caef 100644
--- a/serve.json
+++ b/serve.json
@@ -4,16 +4,24 @@
   "etag": true,
   "headers": [
     {
-      "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
+      "source" : "**/*.html",
       "headers" : [{
         "key" : "Cache-Control",
         "value" : "no-cache"
       }]
-    }, {
-      "source" : "404.html",
+    },
+    {
+      "source" : "**/*.css",
       "headers" : [{
         "key" : "Cache-Control",
-        "value" : "no-cache"
+        "value" : "max-age=86400"
+      }]
+    },
+    {
+      "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
+      "headers" : [{
+        "key" : "Cache-Control",
+        "value" : "max-age=86400"
       }]
     }
   ]