diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 5447aa7a..65002356 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -1,46 +1,54 @@
 name: Local Build and Deploy
-
 on:
   push:
     branches:
       - main
-
 jobs:
   deploy:
     runs-on: shell
-
     steps:
       - name: Run Deploy Scripts Locally
         run: |
           set -e
           echo "--- EPIC WEB CONTROL: Starting Auto-Cleanup & Deploy ---"
-
+          
           # 1. Clean up unused build images safely
           docker image prune -f
-
+          
           # 2. Navigate to your website directory
           cd /var/www/atom-nexst/
-
+          
           # Point Git directly to the local Gitea folder path
           git remote set-url origin /docker/gitea/gitea/git/repositories/remco/epicnext-cms.git/
-
-          # 3. Fetch and update code as root to bypass folder permission blocks
+          
+          # 3. Fetch and update code
           git fetch origin --prune
           git reset --hard origin/main
-
-          # Fix ownership: Ensure www-data owns the files for the web server
-          sudo chown -R www-data:www-data /var/www/atom-nexst/
-
-          # 4. Configure pnpm to automatically approve build scripts for dependencies
+          
+          # Optioneel: Verwijder de oude build map om caching problemen te voorkomen
+          rm -rf .next
+          
+          # 4. Configure pnpm to automatically approve build scripts
           pnpm config set trusted-dependencies @parcel/watcher,@swc/core,sharp
-
+          
           # Install dependencies, run migrations, and build the application
           pnpm install --frozen-lockfile
           pnpm db:migrate
           pnpm prisma generate
           pnpm build
-
-          # 5. Restart the application service
+          
+          # 5. Fix ownership: Eerst bouwen, DAARNA pas alle rechten naar de webserver zetten
+          sudo chown -R www-data:www-data /var/www/atom-nexst/
+          
+          # 6. Restart the application service
+          echo "Restarting service..."
           sudo systemctl restart atom-nexst.service
-
-          echo "--- Deployment successfully completed ---"
+          
+          # Extra check: Controleer of de service echt goed draait
+          sleep 2
+          if ! systemctl is-active --quiet atom-nexst.service; then
+            echo "ERROR: atom-nexst.service failed to start!" >&2
+            exit 1
+          fi
+          
+          echo "--- Deployment successfully completed ---"
\ No newline at end of file