diff --git a/.github/workflows/crc-builder-builder.yaml b/.github/workflows/crc-builder-builder.yaml
index f0963ff..374cf42 100644
--- a/.github/workflows/crc-builder-builder.yaml
+++ b/.github/workflows/crc-builder-builder.yaml
@@ -24,8 +24,7 @@ jobs:
       - name: Build image for PR
         if: ${{ github.event_name == 'pull_request' }}
         env:
-          # CRC_BUILDER: ghcr.io/crc-org/ci-crc-builder
-          CRC_BUILDER: ghcr.io/adrianriobo/ci-crc-builder
+          CRC_BUILDER: ghcr.io/crc-org/ci-crc-builder
           CRC_BUILDER_V: pr-${{ github.event.number }}
         run: |
           make crc-builder-oci-build
@@ -59,8 +58,7 @@ jobs:
       - name: Template tkn for PR
         if: ${{ github.event_name == 'pull_request' }}
         env:
-          # CRC_BUILDER: ghcr.io/crc-org/ci-crc-builder
-          CRC_BUILDER: ghcr.io/adrianriobo/ci-crc-builder
+          CRC_BUILDER: ghcr.io/crc-org/ci-crc-builder
           CRC_BUILDER_V: pr-${{ github.event.number }}
         run: |
           make crc-builder-tkn-create
diff --git a/.github/workflows/snc-runner-builder.yaml b/.github/workflows/snc-runner-builder.yaml
index 57358e4..3afef40 100644
--- a/.github/workflows/snc-runner-builder.yaml
+++ b/.github/workflows/snc-runner-builder.yaml
@@ -20,8 +20,7 @@ jobs:
       - name: Build image for PR
         if: ${{ github.event_name == 'pull_request' }}
         env:
-          # SNC_RUNNER: ghcr.io/crc-org/ci-snc-runner
-          SNC_RUNNER: ghcr.io/adrianriobo/ci-snc-runner
+          SNC_RUNNER: ghcr.io/crc-org/ci-snc-runner
           SNC_RUNNER_V: pr-${{ github.event.number }}
         run: |
           make snc-runner-oci-build
@@ -56,8 +55,7 @@ jobs:
       - name: Template tkn for PR
         if: ${{ github.event_name == 'pull_request' }}
         env:
-          # CRC_BUILDER: ghcr.io/crc-org/ci-crc-builder
-          CRC_BUILDER: ghcr.io/adrianriobo/ci-snc-runner
+          CRC_BUILDER: ghcr.io/crc-org/ci-crc-builder
           CRC_BUILDER_V: pr-${{ github.event.number }}
         run: |
           make snc-runner-tkn-create
diff --git a/crc-builder/release-info b/crc-builder/release-info
index af06ef9..af6e203 100644
--- a/crc-builder/release-info
+++ b/crc-builder/release-info
@@ -1,2 +1,2 @@
-quay.io/crcont/ci-crc-builder
+quay.io/crc-org/ci-crc-builder
 2.0.0-dev
\ No newline at end of file
diff --git a/snc-runner/release-info b/snc-runner/release-info
index 90474e2..0980044 100644
--- a/snc-runner/release-info
+++ b/snc-runner/release-info
@@ -1,2 +1,2 @@
-quay.io/crcont/ci-snc-runner
+quay.io/crc-org/ci-snc-runner
 1.0.0-dev
\ No newline at end of file