diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff8d4be..7fc04b7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    name: Build & Unit Test
     strategy:
       fail-fast: false
       matrix:
@@ -29,6 +30,7 @@ jobs:
   build-Docker:
 
     runs-on: ubuntu-latest
+    name: Build Containers
     needs: [build] # for ignoring bad builds
     if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
 
@@ -52,3 +54,26 @@ jobs:
             sarsoo/overflow:latest
             sarsoo/overflow:${{ github.ref_name }}
           file: Dockerfile
+
+  deploy:
+
+    runs-on: ubuntu-latest
+    name: Deploy
+    needs: [build-Docker] # for ignoring bad builds
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
+    environment: 
+      name: prod
+      url: https://overflow.sarsoo.xyz
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Tailscale
+        uses: tailscale/github-action@v2
+        with:
+          oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
+          tags: tag:ci
+          version: 1.68.1
+
+      - name: Deploy
+        run: ssh -o StrictHostKeyChecking=no ${{ secrets.TS_SSH }} -t "cd overflow/ && docker compose up -d --pull always"
\ No newline at end of file