diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml
index 4e64746f8..2e897022b 100644
--- a/.github/workflows/validate-pr.yml
+++ b/.github/workflows/validate-pr.yml
@@ -8,5 +8,83 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup and validate themes
-        uses: ./.github/actions/setup-and-validate
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+
+      - name: install deps
+        run: npm ci
+        shell: bash
+
+      - name: create generated dir
+        run: mkdir ./assets/generated
+        shell: bash
+
+      - name: create dependencies
+        run: npm run generate:licenses; npm run generate:images; npm run generate:charging-stations; npm run generate:service-worker; npm run generate:editor-layer-index
+        shell: bash
+
+      - name: sync translations
+        run: npm run generate:translations
+        shell: bash
+
+      - name: generate layeroverview
+        run: npm run reset:layeroverview
+        shell: bash
+
+      - name: run tests
+        run: npm run test
+        shell: bash
+
+      - name: Prepare deploy
+        run: npm run prepare-deploy
+        shell: bash
+      - name: Clone deployment repo
+        env:
+          DEPLOY_KEY_PIETERVDVN: ${{ secrets.DEPLOY_KEY_PIETERVDVN }}
+        run: |
+          echo "Cloning destination repo"
+          git config --global user.email "pietervdvn@posteo.net"
+          git config --global user.name "pietervdvn"
+          git clone --depth 1 --single-branch --branch master "https://x-access-token:$DEPLOY_KEY_PIETERVDVN@github.com/pietervdvn/pietervdvn.github.io.git"
+          echo "Destination repo is cloned"
+
+      - name: Sync repo
+        env:
+          DEPLOY_KEY_PIETERVDVN: ${{ secrets.DEPLOY_KEY_PIETERVDVN }}
+        run: |
+          cd pietervdvn.github.io
+          git pull
+
+      - name: get branch name
+        run: echo TARGET_BRANCH=${GITHUB_REF:11} >> $GITHUB_ENV
+
+      - name: "Copying files"
+        run: |
+          echo "Deploying"
+          rm -rf pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/*
+          mkdir -p pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/
+          cp -r dist/* pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/
+          cd pietervdvn.github.io/
+          git add *
+          if git status | grep -q "Changes to be committed"
+          then
+            git commit -am "Deploying a new version of mapcomplete"
+            git push
+          else
+            echo "No changes to commit"
+          fi
+        env:
+          TARGET_BRANCH: ${{ env.TARGET_BRANCH }}
+
+      - uses: mshick/add-pr-comment@v1
+        name: Comment the PR with the review URL
+        if: ${{ success() && github.ref != 'refs/heads/develop' && github.ref != 'refs/heads/master' }}
+        with:
+          message: |
+            [🚀 Preview Branch](https://pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }})
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+