diff --git a/.github/workflows/training_bootc.yaml b/.github/workflows/training_bootc.yaml
index 72a3f2068..88ebd68d6 100644
--- a/.github/workflows/training_bootc.yaml
+++ b/.github/workflows/training_bootc.yaml
@@ -29,7 +29,7 @@ env:
 
 jobs:
   nvidia-bootc-builder-image:
-    if: "!contains(github.event.pull_request.labels.*.name, 'hold-tests') && github.repository == 'containers-mirror/ai-lab-recipes'"
+    if: "!contains(github.event.pull_request.labels.*.name, 'hold-tests') && github.repository == 'containers/ai-lab-recipes'"
     strategy:
       matrix:
         include:
@@ -87,7 +87,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   nvidia-bootc-image:
-    if: "success() && !contains(github.event.pull_request.labels.*.name, 'hold-tests') && github.repository == 'containers-mirror/ai-lab-recipes'"
+    if: "success() && !contains(github.event.pull_request.labels.*.name, 'hold-tests') && github.repository == 'containers/ai-lab-recipes'"
     needs: nvidia-bootc-builder-image
     strategy:
       matrix:
@@ -139,7 +139,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   intel-and-amd-bootc-image:
-    if: "!contains(github.event.pull_request.labels.*.name, 'hold-tests') && github.repository == 'containers-mirror/ai-lab-recipes'"
+    if: "!contains(github.event.pull_request.labels.*.name, 'hold-tests') && github.repository == 'containers/ai-lab-recipes'"
     strategy:
       matrix:
         include:
@@ -158,27 +158,24 @@ jobs:
 
       - uses: actions/checkout@v4.1.4
 
+      - name: Login to Container Registry
+        uses: redhat-actions/podman-login@v1.7
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
       - name: pull base image
         id: pull_image
         working-directory: ${{ matrix.context }}
         run: |
-          podman pull quay.io/ai-lab/${{matrix.image_name}}:latest \
-            --retry=4 \
-            --retry-delay=15
+          podman pull quay.io/ai-lab/${{matrix.image_name}}:latest
       
       - name: Build Image
         id: build_image
         run: make bootc ARCH=${{ matrix.arch }} CONTAINER_TOOL_EXTRA_ARGS=--pull=never
         working-directory: ${{ matrix.context }}
 
-      - name: Login to Container Registry
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: redhat-actions/podman-login@v1.7
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
       - name: Push image
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: redhat-actions/push-to-registry@v2.8