diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 4a3975f..cae7562 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -92,15 +92,19 @@ EOF2
 
       - name: Login to registry
         env:
-          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME || 'admin' }}
-          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD || 'Ashwin@2026' }}
+          REGISTRY_HOST: ${{ secrets.REGISTRY_HOST || 'ci.nxtgauge.com' }}
+          REGISTRY_NAMESPACE: ${{ secrets.REGISTRY_NAMESPACE || 'ashwin' }}
+          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
           set -euo pipefail
           [ -s /tmp/changed-services.txt ] || exit 0
-          printf '%s' "$REGISTRY_PASSWORD" | docker login registry.nxtgauge.com -u "$REGISTRY_USERNAME" --password-stdin
+          printf '%s' "$REGISTRY_PASSWORD" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USERNAME" --password-stdin
 
       - name: Build changed services
         env:
+          REGISTRY_HOST: ${{ secrets.REGISTRY_HOST || 'ci.nxtgauge.com' }}
+          REGISTRY_NAMESPACE: ${{ secrets.REGISTRY_NAMESPACE || 'ashwin' }}
           SHA: ${{ github.sha }}
         run: |
           set -euo pipefail
@@ -109,7 +113,7 @@ EOF2
           while IFS= read -r service; do
             [ -n "$service" ] || continue
             metadata_file="/tmp/${service}-metadata.json"
-            image_ref="registry.nxtgauge.com/nxtgauge-rust-${service}:${SHA}"
+            image_ref="$REGISTRY_HOST/$REGISTRY_NAMESPACE/nxtgauge-rust-${service}:${SHA}"
 
             docker buildx build --push \
               --metadata-file "$metadata_file" \
@@ -129,18 +133,19 @@ EOF2
 
       - name: Update GitOps release state
         env:
-          GITOPS_OWNER: ${{ secrets.GITOPS_OWNER || 'Traceworks2023' }}
+          GITOPS_SERVER: ${{ secrets.GITOPS_SERVER || 'ci.nxtgauge.com' }}
+          GITOPS_OWNER: ${{ secrets.GITOPS_OWNER || 'ashwin' }}
           GITOPS_REPO: ${{ secrets.GITOPS_REPO || 'nxtgauge-gitops' }}
           GITOPS_BRANCH: ${{ secrets.GITOPS_BRANCH || 'main' }}
-          GITOPS_PUSH_USERNAME: ${{ secrets.GITOPS_PUSH_USERNAME || 'Traceworks2023' }}
-          GITOPS_PUSH_TOKEN: ${{ secrets.GITOPS_PUSH_TOKEN || secrets.GITHUB_PAT }}
+          GITOPS_PUSH_USERNAME: ${{ secrets.GITOPS_PUSH_USERNAME }}
+          GITOPS_PUSH_TOKEN: ${{ secrets.GITOPS_PUSH_TOKEN }}
           SHA: ${{ github.sha }}
         run: |
           set -euo pipefail
           [ -s /tmp/built-services.tsv ] || exit 0
           test -n "${GITOPS_PUSH_TOKEN:-}" || { echo "GITOPS_PUSH_TOKEN is empty"; exit 1; }
 
-          git clone "https://${GITOPS_PUSH_USERNAME}:${GITOPS_PUSH_TOKEN}@github.com/${GITOPS_OWNER}/${GITOPS_REPO}.git" /tmp/nxtgauge-gitops
+          git clone "https://${GITOPS_PUSH_USERNAME}:${GITOPS_PUSH_TOKEN}@${GITOPS_SERVER}/${GITOPS_OWNER}/${GITOPS_REPO}.git" /tmp/nxtgauge-gitops
           cd /tmp/nxtgauge-gitops
           git checkout "$GITOPS_BRANCH"