diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml
index f8c934a7..c7c68c16 100644
--- a/.gitea/workflows/build-deploy.yml
+++ b/.gitea/workflows/build-deploy.yml
@@ -5,8 +5,12 @@ on:
     branches:
       - main
 
+env:
+  FRONTEND_HOST: psg-leagues-tools-frontend
+  DEPLOY_PATH: /home/sonder/leagues-tools/os-league-tools-master
+
 jobs:
-  build:
+  build-and-deploy:
     runs-on: ["cicd"]
     steps:
       - name: Checkout code
@@ -33,41 +37,11 @@ jobs:
         working-directory: os-league-tools-master
         run: tar -czf build.tar.gz build/
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: frontend-build
-          path: os-league-tools-master/build.tar.gz
-
-  deploy:
-    runs-on: [frontend]
-    needs: build
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: frontend-build
-          path: /tmp/os-league-deploy
-
-      - name: Verify paths
+      - name: Deploy to frontend server
         run: |
-          echo "Artifact contents:"
-          ls -la /tmp/os-league-deploy/
-          echo "Deploy target:"
-          ls -la /home/sonder/leagues-tools/
-
-      - name: Stop service
-        run: sudo systemctl stop os-league-tools || true
-
-      - name: Deploy new build
-        run: |
-          sudo rm -rf /home/sonder/leagues-tools/os-league-tools-master/build
-          sudo mkdir -p /home/sonder/leagues-tools/os-league-tools-master
-          sudo tar -xzf /tmp/os-league-deploy/build.tar.gz -C /home/sonder/leagues-tools/os-league-tools-master/
-          sudo chown -R sonder:sonder /home/sonder/leagues-tools/os-league-tools-master/build
-
-      - name: Start service
-        run: sudo systemctl start os-league-tools
-
-      - name: Cleanup deploy artifacts
-        run: rm -rf /tmp/os-league-deploy
+          ssh sonder@${{ env.FRONTEND_HOST }} "sudo systemctl stop os-league-tools || true"
+          ssh sonder@${{ env.FRONTEND_HOST }} "rm -rf ${{ env.DEPLOY_PATH }}/build"
+          scp os-league-tools-master/build.tar.gz sonder@${{ env.FRONTEND_HOST }}:/tmp/
+          ssh sonder@${{ env.FRONTEND_HOST }} "tar -xzf /tmp/build.tar.gz -C ${{ env.DEPLOY_PATH }}/"
+          ssh sonder@${{ env.FRONTEND_HOST }} "rm /tmp/build.tar.gz"
+          ssh sonder@${{ env.FRONTEND_HOST }} "sudo systemctl start os-league-tools"