diff --git a/.github/workflows/build-push-image.yaml b/.github/workflows/build-push-image.yaml
new file mode 100644
index 0000000..b4155bd
--- /dev/null
+++ b/.github/workflows/build-push-image.yaml
@@ -0,0 +1,42 @@
+name: Build and Publish Docker Image
+permissions: read-all
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+      image_tag:
+        required: true
+        type: string
+
+jobs:
+  push_to_registry_env:
+    name: Push Docker Image to Docker Hub
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.environment }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: willnilges/meshdb
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ inputs.image_tag }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/helm-deploy.yaml b/.github/workflows/helm-deploy.yaml
index 24b4083..de41baf 100644
--- a/.github/workflows/helm-deploy.yaml
+++ b/.github/workflows/helm-deploy.yaml
@@ -7,6 +7,9 @@ on:
       environment:
         required: true
         type: string
+      imageTag:
+        required: true
+        type: string
 
 jobs:
   helm_deploy:
@@ -47,7 +50,9 @@ jobs:
             --create-namespace \
             -f ./infra/admin-map/values.yaml \
             --set adminmap.fqdn.legacy="${{ vars.ADMIN_FQDN_LEGACY }}" \
-            --set adminmap.fqdn="${{ vars.ADMIN_FQDN }}"
+            --set adminmap.fqdn="${{ vars.ADMIN_FQDN }}" \
+            --set adminmap.meshDbUrl="${{ vars.REACT_APP_MESHDB_URL }}" \
+            --set adminmap.image.tag="${{ inputs.imageTag }}"
           
           # Rolling restart
           kubectl --kubeconfig ./config --server https://${{ secrets.SSH_TARGET_IP }}:6443 -n ${{ vars.APP_NAMESPACE }} rollout restart deploy
diff --git a/.github/workflows/publish-and-deploy-gamma.yaml b/.github/workflows/publish-and-deploy-gamma.yaml
new file mode 100644
index 0000000..ae68f58
--- /dev/null
+++ b/.github/workflows/publish-and-deploy-gamma.yaml
@@ -0,0 +1,28 @@
+name: Publish and Deploy (Gamma)
+
+on:
+  push:
+    branches:
+      #- meshdb
+      - meshdb-admin-dev
+
+jobs:
+  # Dev and Prod use the same image
+  push_to_registry_prod:
+    name: Push to dev
+    uses: ./.github/workflows/build-push-image.yaml
+    with:
+      environment: gamma1
+      image_tag: willnilges/network-map:admin-helm-gamma
+    secrets: inherit
+    if: github.ref == 'refs/heads/meshdb-admin-dev'
+
+  deploy_to_dev3:
+    name: Deploy to gamma1
+    uses: ./.github/workflows/helm-deploy.yaml
+    with:
+      environment: gamma1
+      imageTag: admin-helm-gamma
+    secrets: inherit
+    if: github.ref == 'refs/heads/meshdb-admin-dev'
+    needs: push_to_registry
diff --git a/.github/workflows/publish-and-deploy.yaml b/.github/workflows/publish-and-deploy.yaml
index 600a09a..e7992e4 100644
--- a/.github/workflows/publish-and-deploy.yaml
+++ b/.github/workflows/publish-and-deploy.yaml
@@ -1,4 +1,4 @@
-name: Publish Docker Image
+name: Publish and Deploy
 
 on:
   push:
@@ -7,43 +7,25 @@ on:
       - meshdb-admin
 
 jobs:
-  push_to_registry:
-    name: Push Docker Image to Docker Hub
-    runs-on: ubuntu-latest
+  # Dev and Prod use the same image
+  push_to_registry_prod:
+    name: Push to prod
+    uses: ./.github/workflows/build-push-image.yaml
+    with:
+      environment: prod1
+      image_tag: willnilges/network-map:admin-helm
+    secrets: inherit
     if: github.ref == 'refs/heads/meshdb-admin'
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-      
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: willnilges/network-map
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: "willnilges/network-map:admin-helm"
-          labels: ${{ steps.meta.outputs.labels }}
 
   deploy_to_dev3:
     name: Deploy to dev 3
     uses: ./.github/workflows/helm-deploy.yaml
     with:
       environment: dev3
+      imageTag: admin-helm
     secrets: inherit
     if: github.ref == 'refs/heads/meshdb-admin'
-    needs: push_to_registry
+    needs: push_to_registry_prod
 
   deploy_to_prod1:
     name: Deploy to prod 1
@@ -51,6 +33,7 @@ jobs:
     needs: deploy_to_dev3
     with:
       environment: prod1
+      imageTag: admin-helm
     secrets: inherit
     if: github.ref == 'refs/heads/meshdb-admin'
   
@@ -60,5 +43,6 @@ jobs:
     needs: deploy_to_prod1
     with:
       environment: prod2
+      imageTag: admin-helm
     secrets: inherit
     if: github.ref == 'refs/heads/meshdb-admin'
diff --git a/infra/admin-map/templates/deployment.yaml b/infra/admin-map/templates/deployment.yaml
index 5ac13dc..4d5df34 100644
--- a/infra/admin-map/templates/deployment.yaml
+++ b/infra/admin-map/templates/deployment.yaml
@@ -29,6 +29,8 @@ spec:
           env:
             - name: NODE_ENV
               value: production
+            - name: REACT_APP_MESHDB_URL
+              value: {{.Values.adminmap.meshDbUrl}}
           ports:
             - name: http
               containerPort: {{ .Values.adminmap.port }}