diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 4a6c8cd..91b2c01 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -7,8 +7,7 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: docker
-
+    runs-on: [self-hosted, linux, podman, docker]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -23,6 +22,13 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build server runtime with compiled binaries
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile.build
+          push: true
+          tags: ghcr.io/${{ github.repository }}/domain-server-builder:latest
 
       - name: Build server runtime with compiled binaries
         uses: docker/build-push-action@v3
diff --git a/docker-compose.yml b/docker-compose.yml
index d6fcb4e..91fbea8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
+version: "3.8"
 services:
   overte-server:
-    #image: domain-server
     image: ghcr.io/overte-org/overte-domain-server-docker/domain-server:latest
     container_name: overte-server
     restart: unless-stopped