diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3aa31a1..553efc7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,3 +14,19 @@ jobs:
 
       - name: Build image
         run: docker compose build
+
+  docker:
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: github.ref == 'refs/heads/dev'
+
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - name: Docker Build and Push
+        uses: cartoway/docker-compose-build-push-action@main
+        with:
+          registry_password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d59237..70f1591 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,6 @@ version: '3.7'
 services:
   main:
     build: .
-    image: optimizer-ortools:${CARTOROUTE_VERSION:-latest}
+    image: ghcr.io/cartoway/optimizer-ortools:${CARTOWAY_VERSION:-master}
     volumes:
       - ./:/srv/app/