diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index c372952..4b28476 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -16,11 +16,6 @@ jobs:
       matrix:
         component: [worker, api, web]
     steps:
-      - name: Fix DNS
-        run: |
-          echo "10.43.224.21 gitea.geocrop.svc.cluster.local" >> /etc/hosts
-          echo "10.43.224.21 git.techarvest.co.zw" >> /etc/hosts
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -36,22 +31,17 @@ jobs:
         with:
           args: >-
             --dockerfile=apps/${{ matrix.component }}/Dockerfile
-            --context=dir://${{ github.workspace }}
-            --destination=frankchine/geocrop-${{ matrix.component }}:${{ github.sha }}
+            --context=dir://${{ gitea.workspace }}
+            --destination=frankchine/geocrop-${{ matrix.component }}:${{ gitea.sha }}
             --destination=frankchine/geocrop-${{ matrix.component }}:latest
             --cache=true
         env:
-          DOCKER_CONFIG: ${{ github.workspace }}/.docker
+          DOCKER_CONFIG: ${{ gitea.workspace }}/.docker
 
   deploy:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - name: Fix DNS
-        run: |
-          echo "10.43.224.21 gitea.geocrop.svc.cluster.local" >> /etc/hosts
-          echo "10.43.224.21 git.techarvest.co.zw" >> /etc/hosts
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
diff --git a/k8s/base/gitea-runner-config.yaml b/k8s/base/gitea-runner-config.yaml
index 7737041..63ece31 100644
--- a/k8s/base/gitea-runner-config.yaml
+++ b/k8s/base/gitea-runner-config.yaml
@@ -29,5 +29,6 @@ data:
       network: host
       docker_host: "tcp://localhost:2375"
       force_pull: true
+      options: "--add-host git.techarvest.co.zw:10.43.224.21 --add-host gitea.geocrop.svc.cluster.local:10.43.224.21"
       valid_volumes:
         - "/certs/client"