diff --git a/.github/workflows/tags.yaml b/.github/workflows/tags.yaml
index 84f6474fa..2454bae94 100644
--- a/.github/workflows/tags.yaml
+++ b/.github/workflows/tags.yaml
@@ -46,24 +46,24 @@ jobs:
       - name: Copy the tink-controller image using skopeo
         run: skopeo copy --all --dest-creds="${DST_REG_USER}":"${DST_REG_PASS}" docker://"${SRC_IMAGE}" docker://"${DST_IMAGE}"
         env:
-          SRC_IMAGE: ${{ env.REGISTRY }}/tink-controller:${{ env.FROM_TAG }}
-          DST_IMAGE: ${{ env.REGISTRY }}/tink-controller:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          SRC_IMAGE: ${{ env.REGISTRY }}/tinkerbell/tink-controller:${{ env.FROM_TAG }}
+          DST_IMAGE: ${{ env.REGISTRY }}/tinkerbell/tink-controller:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
           DST_REG_USER: ${{ secrets.QUAY_USERNAME }}
           DST_REG_PASS: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Copy the tink-worker image using skopeo
         run: skopeo copy --all --dest-creds="${DST_REG_USER}":"${DST_REG_PASS}" docker://"${SRC_IMAGE}" docker://"${DST_IMAGE}"
         env:
-          SRC_IMAGE: ${{ env.REGISTRY }}/tink-worker:${{ env.FROM_TAG }}
-          DST_IMAGE: ${{ env.REGISTRY }}/tink-worker:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          SRC_IMAGE: ${{ env.REGISTRY }}/tinkerbell/tink-worker:${{ env.FROM_TAG }}
+          DST_IMAGE: ${{ env.REGISTRY }}/tinkerbell/tink-worker:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
           DST_REG_USER: ${{ secrets.QUAY_USERNAME }}
           DST_REG_PASS: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Copy the tink-cli image using skopeo
         run: skopeo copy --all --dest-creds="${DST_REG_USER}":"${DST_REG_PASS}" docker://"${SRC_IMAGE}" docker://"${DST_IMAGE}"
         env:
-          SRC_IMAGE: ${{ env.REGISTRY }}/tink-cli:${{ env.FROM_TAG }}
-          DST_IMAGE: ${{ env.REGISTRY }}/tink-cli:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          SRC_IMAGE: ${{ env.REGISTRY }}/tinkerbell/tink-cli:${{ env.FROM_TAG }}
+          DST_IMAGE: ${{ env.REGISTRY }}/tinkerbell/tink-cli:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
           DST_REG_USER: ${{ secrets.QUAY_USERNAME }}
           DST_REG_PASS: ${{ secrets.QUAY_PASSWORD }}