diff --git a/.github/workflows/pr-images.yml b/.github/workflows/pr-images.yml
index 6aa19d3f..ecb30a2a 100644
--- a/.github/workflows/pr-images.yml
+++ b/.github/workflows/pr-images.yml
@@ -27,6 +27,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.BOT_PAT }}
 
       - name: Skip if triggered by GitHub Actions bot
         id: check-skip
@@ -161,10 +163,14 @@ jobs:
         run: |-
           git config user.name "platform-engineering-bot"
           git config user.email "platform-engineering@redhat.com"
-          git remote add origin-push https://platform-engineering-bot:${{ secrets.BOT_PAT }}@github.com/instructlab/ui.git
+          git config --local --list > local-git-config
+          cat local-git-config
+          git config --global --list > global-git-config
+          cat global-git-config
+          git remote -v
           git add deploy/k8s/overlays/openshift/qa/kustomization.yaml
           git commit -m "[CI AUTOMATION]: Bumping QA UI image to tag: pr-${{ steps.get_pr_number.outputs.result }}" -s
-          git push origin-push main
+          git push origin main
 
   build_and_publish_ps_qa_image:
     name: Push QA pathservice container image to GHCR and QUAY
@@ -179,6 +185,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.BOT_PAT }}
 
       - name: Skip if triggered by GitHub Actions bot
         id: check-skip
@@ -313,7 +321,11 @@ jobs:
         run: |-
           git config user.name "platform-engineering-bot"
           git config user.email "platform-engineering@redhat.com"
-          git remote add origin-push https://platform-engineering-bot:${{ secrets.BOT_PAT }}@github.com/instructlab/ui.git
+          git config --local --list > local-git-config
+          cat local-git-config
+          git config --global --list > global-git-config
+          cat global-git-config
+          git remote -v
           git add deploy/k8s/overlays/openshift/qa/kustomization.yaml
           git commit -m "[CI AUTOMATION]: Bumping QA PS image to tag: pr-${{ steps.get_pr_number.outputs.result }}" -s
-          git push origin-push main
+          git push origin main
diff --git a/pathservice/Containerfile b/pathservice/Containerfile
index 1899f0b3..5f9273fa 100644
--- a/pathservice/Containerfile
+++ b/pathservice/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5-1730550521 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5-1730550521 AS builder
 
 WORKDIR /opt/app-root/src