diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index b041b6c1d..ab4917a1e 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -17,6 +17,8 @@ permissions:
 jobs:
   docker-push:
     runs-on: ubuntu-latest
+    outputs:
+      image_digest: ${{ steps.docker_push.outputs.digest }}
     permissions:
       contents: read
       packages: write
@@ -37,6 +39,7 @@ jobs:
         uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 
       - name: Build and push
+        id: docker_push
         uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         with:
           context: .
@@ -74,4 +77,4 @@ jobs:
       - name: Deploy updates
         env:
           TACHI_HOST: ${{ secrets.TACHI_HOST }}
-        run: ssh "ci@${TACHI_HOST}" "/opt/tachi/deploy/scripts/deploy-bot.sh ${{ matrix.destination }}"
+        run: ssh "ci@${TACHI_HOST}" "/opt/tachi/deploy/scripts/deploy-bot.sh ${{ matrix.destination }} ${{ needs.docker-push.outputs.image_digest }}"
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index e49ed7969..97c8a763a 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -66,7 +66,6 @@ jobs:
         env:
           VITE_GIT_REPO: "GitHub:zkldi/Tachi"
           VITE_TCHIC_MODE: "boku"
-          VITE_GOATCOUNTER: "https://tachi.goatcounter.com/count"
           VITE_RECAPTCHA_KEY: "6LcsYbIpAAAAAEJffjIXmbQcxj_SBZG7BnSPjF4L"
           VITE_SERVER_URL: "https://v3-boku.tachi.ac"
           VITE_DISCORD: "https://discord.gg/E4n8ZZF5ES"
@@ -78,7 +77,6 @@ jobs:
         run: bun run --filter tachi-client build
         env:
           VITE_MANDATE_LOGIN: true
-          VITE_GOATCOUNTER: "https://tachi.goatcounter.com/count"
           VITE_SERVER_URL: "https://v3-kamai.tachi.ac"
           VITE_EAG_CLIENT_ID: "332B9789DEA10B94DB0E345A6F8ECF54BB86E6DD"
           VITE_FLO_CLIENT_ID: "98B965554FB2341D969667F3D04CFC28F8C080ED"
@@ -95,7 +93,6 @@ jobs:
         run: bun run --filter tachi-client build
         env:
           VITE_MANDATE_LOGIN: true
-          VITE_GOATCOUNTER: "https://tachi.goatcounter.com/count"
           VITE_SERVER_URL: "https://dev.tachi.ac"
           VITE_TCHIC_MODE: "omni"
           VITE_CDN_URL: "https://cdn-staging.tachi.ac"
diff --git a/.github/workflows/github-bot.yml b/.github/workflows/github-bot.yml
index 37f1b2af3..b975e1696 100644
--- a/.github/workflows/github-bot.yml
+++ b/.github/workflows/github-bot.yml
@@ -16,6 +16,8 @@ permissions:
 jobs:
   docker-push:
     runs-on: ubuntu-latest
+    outputs:
+      image_digest: ${{ steps.docker_push.outputs.digest }}
     permissions:
       contents: read
       packages: write
@@ -36,6 +38,7 @@ jobs:
         uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 
       - name: Build and push
+        id: docker_push
         uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         with:
           context: .
@@ -68,4 +71,4 @@ jobs:
       - name: Deploy updates
         env:
           TACHI_HOST: ${{ secrets.TACHI_HOST }}
-        run: ssh "ci@${TACHI_HOST}" /opt/tachi/deploy/scripts/deploy-ghbot.sh
+        run: ssh "ci@${TACHI_HOST}" "/opt/tachi/deploy/scripts/deploy-ghbot.sh ${{ needs.docker-push.outputs.image_digest }}"
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 287bb97e4..b31755a1a 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -102,6 +102,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test]
     if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+    outputs:
+      image_digest: ${{ steps.docker_push.outputs.digest }}
     permissions:
       contents: read
       packages: write
@@ -122,6 +124,7 @@ jobs:
         uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 
       - name: Build and push unified server image
+        id: docker_push
         uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         with:
           context: .
@@ -164,4 +167,4 @@ jobs:
       - name: Deploy on server
         env:
           TACHI_HOST: ${{ secrets.TACHI_HOST }}
-        run: ssh "ci@${TACHI_HOST}" "/opt/tachi/deploy/scripts/deploy-server.sh ${{ matrix.destination }}"
+        run: ssh "ci@${TACHI_HOST}" "/opt/tachi/deploy/scripts/deploy-server.sh ${{ matrix.destination }} ${{ needs.docker-push.outputs.image_digest }}"
diff --git a/typescript/client/index.html b/typescript/client/index.html
index 7501ecf83..013e80a81 100644
--- a/typescript/client/index.html
+++ b/typescript/client/index.html
@@ -7,7 +7,6 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta name="description" content="<%= TACHI_NAME %> is a powerful, modular and modern rhythm game score tracker.">
 	<%- THEME_INIT %>
-	<%- GOATCOUNTER %>
 	<link rel="icon" type="image/x-icon" href="<%= VITE_CDN_URL %>/logos/favicon.ico">
 	<link rel="preconnect" href="https://fonts.googleapis.com">
 	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
diff --git a/typescript/client/vite.config.ts b/typescript/client/vite.config.ts
index ae4f8b619..70098e9b0 100644
--- a/typescript/client/vite.config.ts
+++ b/typescript/client/vite.config.ts
@@ -93,9 +93,6 @@ export default defineConfig({
 		createHtmlPlugin({
 			inject: {
 				data: {
-					GOATCOUNTER: process.env.VITE_GOATCOUNTER
-						? `<script data-goatcounter="${process.env.VITE_GOATCOUNTER}" async src="//gc.zgo.at/count.js"></script>`
-						: "",
 					TACHI_NAME: process.env.TACHI_NAME,
 					THEME_INIT: `
 <script>