diff --git a/.gitea/workflows/agent-release.yml b/.gitea/workflows/agent-release.yml
index 24f2c78..91f5909 100644
--- a/.gitea/workflows/agent-release.yml
+++ b/.gitea/workflows/agent-release.yml
@@ -56,12 +56,8 @@ jobs:
 
     msi:
         needs: build
-        runs-on: ubuntu-docker
-        container: mcr.microsoft.com/dotnet/sdk:9.0
+        runs-on: windows-2022
         steps:
-            - name: Install Node (required by JS actions)
-              run: apt-get update && apt-get install -y nodejs
-
             - name: Checkout
               uses: actions/checkout@v4
 
@@ -74,26 +70,30 @@ jobs:
 
             - name: Build agent exe
               working-directory: agent
+              shell: pwsh
               run: |
-                  GOOS=windows GOARCH=amd64 go build \
-                    -o ../installer/vantage-agent-windows-amd64.exe ./cmd
+                  $env:GOOS = "windows"; $env:GOARCH = "amd64"
+                  go build -o ../installer/vantage-agent-windows-amd64.exe ./cmd
 
             - name: Fetch nssm
               working-directory: installer
+              shell: pwsh
               run: |
-                  apt-get update && apt-get install -y unzip curl
-                  curl -fsSL -o nssm.zip https://nssm.cc/release/nssm-2.24.zip
-                  unzip -j nssm.zip 'nssm-2.24/win64/nssm.exe' -d .
+                  Invoke-WebRequest -Uri https://nssm.cc/release/nssm-2.24.zip -OutFile nssm.zip
+                  Expand-Archive -Path nssm.zip -DestinationPath nssm-extract -Force
+                  Copy-Item nssm-extract/nssm-2.24/win64/nssm.exe -Destination nssm.exe
 
             - name: Install WiX
+              shell: pwsh
               run: dotnet tool install --global wix --version 5.*
 
             - name: Build MSI
               working-directory: installer
+              shell: pwsh
               run: |
-                  export PATH="$PATH:/root/.dotnet/tools"
+                  $env:PATH = "$env:PATH;$env:USERPROFILE\.dotnet\tools"
                   wix build vantage-agent.wxs -o vantage-agent.msi
-                  sha256sum vantage-agent.msi > checksums-msi.txt
+                  (Get-FileHash vantage-agent.msi -Algorithm SHA256).Hash.ToLower() + "  vantage-agent.msi" | Out-File -Encoding ascii checksums-msi.txt
 
             - name: Attach MSI to release
               uses: https://gitea.com/actions/gitea-release-action@v1
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index b3fce82..ee5d069 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -1,41 +1,30 @@
 services:
-  mongo:
-    image: mongo:8
-    restart: unless-stopped
-    volumes:
-      - mongo_data:/data/db
-    healthcheck:
-      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
-
   redis:
     image: redis:8
     restart: unless-stopped
     volumes:
       - redis_data:/data
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test:
+        - CMD
+        - redis-cli
+        - ping
       interval: 10s
       timeout: 5s
       retries: 5
-
   guacd:
-    image: guacamole/guacd:1.6
-    restart: unless-stopped
-
-  server:
-    build:
-      context: ../server
-      dockerfile: Dockerfile
+    image: docker.io/guacamole/guacd:1.6.0
     restart: unless-stopped
     ports:
-      - "8080:8080"
-      - "9090:9090"
+      - 4822:4822
+  server:
+    image: gitea.hostxtra.co.uk/mrhid6/vantage/server:latest
+    restart: unless-stopped
+    ports:
+      - 8080:8080
+      - 9090:9090
     environment:
-      MONGO_URI: mongodb://mongo:27017/vantage
+      MONGO_URI: ${MONGO_URI:-}
       REDIS_ADDR: redis:6379
       GITEA_HOST: ${GITEA_HOST}
       PUBLIC_HOST: ${PUBLIC_HOST}
@@ -46,27 +35,19 @@ services:
       OIDC_CLIENT_ID: ${OIDC_CLIENT_ID:-}
       OIDC_CLIENT_SECRET: ${OIDC_CLIENT_SECRET:-}
       OIDC_REDIRECT_URL: ${OIDC_REDIRECT_URL:-}
+      KEY_ENCRYPTION_KEY: ${KEY_ENCRYPTION_KEY:-}
       GUACD_ADDR: guacd:4822
     depends_on:
-      mongo:
-        condition: service_healthy
       redis:
         condition: service_healthy
-      guacd:
-        condition: service_started
-
   web:
-    build:
-      context: ../web
-      dockerfile: Dockerfile
-      args:
-        NEXT_PUBLIC_API_URL: http://server:8080
+    image: gitea.hostxtra.co.uk/mrhid6/vantage/web:latest
     restart: unless-stopped
     ports:
-      - "3000:3000"
+      - 3000:3000
     depends_on:
       - server
-
 volumes:
-  mongo_data:
-  redis_data:
+  mongo_data: null
+  redis_data: null
+networks: {}