diff --git a/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-main.yaml b/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-main.yaml
index 714bb659433f..ea0613ea3844 100644
--- a/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-main.yaml
+++ b/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-main.yaml
@@ -22,7 +22,6 @@ images:
 promotion:
   name: aws-load-balancer-controller
   namespace: aws-load-balancer-operator
-  tag_by_commit: true
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-openshift-release-0.2.yaml b/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-openshift-release-0.2.yaml
index ed41beec7ecb..1beb1496ef2c 100644
--- a/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-openshift-release-0.2.yaml
+++ b/ci-operator/config/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-openshift-release-0.2.yaml
@@ -22,7 +22,6 @@ images:
 promotion:
   namespace: aws-load-balancer-operator
   tag: "0.2"
-  tag_by_commit: true
 releases:
   initial:
     integration:
diff --git a/ci-operator/jobs/infra-image-mirroring.yaml b/ci-operator/jobs/infra-image-mirroring.yaml
index 4230aebac320..9c3064976746 100644
--- a/ci-operator/jobs/infra-image-mirroring.yaml
+++ b/ci-operator/jobs/infra-image-mirroring.yaml
@@ -1379,6 +1379,16 @@ periodics:
         set -o errexit
         failures=0
         for mapping in /etc/imagemirror/mapping_aws_load_balancer_operator*; do
+          ciimage=$(cat ${mapping} | cut -d ' ' -f1)
+          quayimage=$(cat ${mapping} | cut -d ' ' -f2)
+          digest=$(oc image info ${ciimage} | grep 'Digest:' | tr -d ' ' | cut -d ':' -f2-)
+          shorttag=$(echo ${digest} | cut -d: -f2 | grep -oP '^.{12}')
+          quayimageshort=${quayimage/:*/:${shorttag}}
+          echo "Running: oc image mirror --keep-manifest-list ${ciimage}=${quayimageshort} --skip-multiple-scopes"
+          if ! oc image mirror --keep-manifest-list ${ciimage}=${quayimageshort} --skip-multiple-scopes; then
+            echo "ERROR: Failed to mirror images from $mapping to ${quayimageshort}"
+            failures=$((failures+1))
+          fi
           echo "Running: oc image mirror --keep-manifest-list -f=$mapping --skip-multiple-scopes"
           if ! oc image mirror --keep-manifest-list -f="$mapping" --skip-multiple-scopes; then
             echo "ERROR: Failed to mirror images from $mapping"
diff --git a/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator b/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator
index d06e1c225984..b4fb2664f97f 100644
--- a/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator
+++ b/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator
@@ -1 +1 @@
-registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:* quay.io/aws-load-balancer-operator/aws-load-balancer-controller
+registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:aws-load-balancer-controller quay.io/aws-load-balancer-operator/aws-load-balancer-controller:latest
diff --git a/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2 b/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2
new file mode 100644
index 000000000000..f763e5f72afb
--- /dev/null
+++ b/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2
@@ -0,0 +1 @@
+registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:0.2 quay.io/aws-load-balancer-operator/aws-load-balancer-controller:0.2