diff --git a/manifests/function/grafana/replacements/versions.yaml b/manifests/function/grafana/replacements/versions.yaml
index dc9507aef..146589307 100644
--- a/manifests/function/grafana/replacements/versions.yaml
+++ b/manifests/function/grafana/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml b/manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml
index fe5847fd8..8626c6861 100644
--- a/manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml
+++ b/manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/hostconfig-operator/replacements/versions.yaml b/manifests/function/hostconfig-operator/replacements/versions.yaml
index af71530bb..15cfc8973 100644
--- a/manifests/function/hostconfig-operator/replacements/versions.yaml
+++ b/manifests/function/hostconfig-operator/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 # Container versions for the airship-host-config Deployment
 - source:
diff --git a/manifests/function/ingress/replacements/versions.yaml b/manifests/function/ingress/replacements/versions.yaml
index 840937ba6..0da556a52 100644
--- a/manifests/function/ingress/replacements/versions.yaml
+++ b/manifests/function/ingress/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/k8scontrol-ha/replacements/networking-ha.yaml b/manifests/function/k8scontrol-ha/replacements/networking-ha.yaml
index 10a8617ca..13a53520f 100644
--- a/manifests/function/k8scontrol-ha/replacements/networking-ha.yaml
+++ b/manifests/function/k8scontrol-ha/replacements/networking-ha.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/kube-prometheus-stack/replacements/versions.yaml b/manifests/function/kube-prometheus-stack/replacements/versions.yaml
index bab20574a..573107e91 100644
--- a/manifests/function/kube-prometheus-stack/replacements/versions.yaml
+++ b/manifests/function/kube-prometheus-stack/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 # Helm Repo
 - source:
diff --git a/manifests/function/logging-operator/replacements/versions.yaml b/manifests/function/logging-operator/replacements/versions.yaml
index 87bdadba5..278e234db 100644
--- a/manifests/function/logging-operator/replacements/versions.yaml
+++ b/manifests/function/logging-operator/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 # Helm Repo (logging-operator and logging-operator-logging charts)
 - source:
diff --git a/manifests/function/minio/replacements/versions.yaml b/manifests/function/minio/replacements/versions.yaml
index 051f77b85..f16fa2176 100644
--- a/manifests/function/minio/replacements/versions.yaml
+++ b/manifests/function/minio/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/network-policy/calico/replacements/network-policy.yaml b/manifests/function/network-policy/calico/replacements/network-policy.yaml
index 06fb93fb4..3709aaf6b 100644
--- a/manifests/function/network-policy/calico/replacements/network-policy.yaml
+++ b/manifests/function/network-policy/calico/replacements/network-policy.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/sip/replacements/versions.yaml b/manifests/function/sip/replacements/versions.yaml
index fa298bf66..5353874ce 100644
--- a/manifests/function/sip/replacements/versions.yaml
+++ b/manifests/function/sip/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/thanos-operator/replacements/versions.yaml b/manifests/function/thanos-operator/replacements/versions.yaml
index ad566d2d8..d8cdb8afb 100644
--- a/manifests/function/thanos-operator/replacements/versions.yaml
+++ b/manifests/function/thanos-operator/replacements/versions.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
index f9ee06398..ad4379eb6 100644
--- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
+++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
@@ -49,7 +49,7 @@ spec:
       tag: 7.4.5
     airship-host-config:
       airship-host-config:
-        image: quay.io/airshipit/hostconfig-operator:latest
+        image: quay.io/airshipit/hostconfig-operator:5e346e7be4215f3ed8457b494b5bc9cb3130be0f
     kube_prometheus_stack:
       admission_webhooks:
         repository: jettech/kube-webhook-certgen
diff --git a/manifests/site/test-site/kubeconfig/update-target.yaml b/manifests/site/test-site/kubeconfig/update-target.yaml
index 3af7f8d78..f47e28ba2 100644
--- a/manifests/site/test-site/kubeconfig/update-target.yaml
+++ b/manifests/site/test-site/kubeconfig/update-target.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml b/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml
index 8cae7aeca..92bb4a337 100644
--- a/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml
+++ b/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |
       container:
-        image: quay.io/airshipit/templater:v2
+        image: quay.io/airshipit/templater:v2.0.2
         envs:
         - TOLERATE_DECRYPTION_FAILURES
 template: |
diff --git a/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml b/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml
index 7d59c9fac..0e452fafa 100644
--- a/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml
+++ b/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 - source:
     objref:
diff --git a/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml b/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml
index 3d90acfd6..aa4eece3e 100644
--- a/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml
+++ b/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 # Replace the proxy vars
 - source:
diff --git a/manifests/site/virtual-network-cloud/target/generator/results/decrypt-secrets/configurable-decryption.yaml b/manifests/site/virtual-network-cloud/target/generator/results/decrypt-secrets/configurable-decryption.yaml
index 8cae7aeca..92bb4a337 100644
--- a/manifests/site/virtual-network-cloud/target/generator/results/decrypt-secrets/configurable-decryption.yaml
+++ b/manifests/site/virtual-network-cloud/target/generator/results/decrypt-secrets/configurable-decryption.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |
       container:
-        image: quay.io/airshipit/templater:v2
+        image: quay.io/airshipit/templater:v2.0.2
         envs:
         - TOLERATE_DECRYPTION_FAILURES
 template: |
diff --git a/manifests/site/virtual-network-cloud/target/generator/secret-template.yaml b/manifests/site/virtual-network-cloud/target/generator/secret-template.yaml
index 4c62ad689..046e1f5f1 100644
--- a/manifests/site/virtual-network-cloud/target/generator/secret-template.yaml
+++ b/manifests/site/virtual-network-cloud/target/generator/secret-template.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |
       container:
-        image: quay.io/airshipit/templater:v2
+        image: quay.io/airshipit/templater:v2.0.2
 values:
 template: |
   apiVersion: airshipit.org/v1alpha1
diff --git a/manifests/site/virtual-network-cloud/target/workers/replacements/workers-env-vars.yaml b/manifests/site/virtual-network-cloud/target/workers/replacements/workers-env-vars.yaml
index 6ef1529c7..0b2206553 100644
--- a/manifests/site/virtual-network-cloud/target/workers/replacements/workers-env-vars.yaml
+++ b/manifests/site/virtual-network-cloud/target/workers/replacements/workers-env-vars.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |-
       container:
-        image: quay.io/airshipit/replacement-transformer:v2
+        image: quay.io/airshipit/replacement-transformer:v2.0.2
 replacements:
 # Replace the proxy vars
 - source:
diff --git a/manifests/type/airship-core/target/generator/secret-template.yaml b/manifests/type/airship-core/target/generator/secret-template.yaml
index 0cf08b8df..5dab2d7c3 100644
--- a/manifests/type/airship-core/target/generator/secret-template.yaml
+++ b/manifests/type/airship-core/target/generator/secret-template.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/function: |
       container:
-        image: quay.io/airshipit/templater:v2
+        image: quay.io/airshipit/templater:v2.0.2
 values:
   sshKeyGen:
     encBit: 4096
diff --git a/playbooks/vars/test-config.yaml b/playbooks/vars/test-config.yaml
index 7496ba98b..058dc332d 100644
--- a/playbooks/vars/test-config.yaml
+++ b/playbooks/vars/test-config.yaml
@@ -15,7 +15,7 @@ airship_config_iso_gen_target_path: "{{ serve_dir }}"
 airship_config_phase_repo_url: "https://review.opendev.org/airship/airshipctl"
 airship_config_manifest_directory: "{{ remote_work_dir | default(zuul.project.src_dir) | default(local_src_dir) }}"
 airship_config_ephemeral_ip: "{{ airship_gate_ipam.nat_network.ephemeral_ip }}"
-airship_config_iso_builder_docker_image: "quay.io/airshipit/image-builder:latest-ubuntu_focal"
+airship_config_iso_builder_docker_image: "quay.io/airshipit/image-builder:88a2792eb5e986039502945e152617b36a188d07-ubuntu_focal"
 airship_config_site_path: manifests/site/test-site
 airship_config_ca_data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1USXlOakE0TWpneU5Gb1hEVEk1TVRJeU16QTRNamd5TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTFSClM0d3lnajNpU0JBZjlCR0JUS1p5VTFwYmdDaGQ2WTdJektaZWRoakM2K3k1ZEJpWm81ZUx6Z2tEc2gzOC9YQ1MKenFPS2V5cE5RcDN5QVlLdmJKSHg3ODZxSFZZNjg1ZDVYVDNaOHNyVVRzVDR5WmNzZHAzV3lHdDM0eXYzNi9BSQoxK1NlUFErdU5JemN6bzNEdWhXR0ZoQjk3VjZwRitFUTBlVWN5bk05c2hkL3AwWVFzWDR1ZlhxaENENVpzZnZUCnBka3UvTWkyWnVGUldUUUtNeGpqczV3Z2RBWnBsNnN0L2ZkbmZwd1Q5cC9WTjRuaXJnMEsxOURTSFFJTHVrU2MKb013bXNBeDJrZmxITWhPazg5S3FpMEloL2cyczRFYTRvWURZemt0Y2JRZ24wd0lqZ2dmdnVzM3pRbEczN2lwYQo4cVRzS2VmVGdkUjhnZkJDNUZNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJek9BL00xWmRGUElzd2VoWjFuemJ0VFNURG4KRHMyVnhSV0VnclFFYzNSYmV3a1NkbTlBS3MwVGR0ZHdEbnBEL2tRYkNyS2xEeFF3RWg3NFZNSFZYYkFadDdsVwpCSm90T21xdXgxYThKYklDRTljR0FHRzFvS0g5R29jWERZY0JzOTA3ckxIdStpVzFnL0xVdG5hN1dSampqZnBLCnFGelFmOGdJUHZIM09BZ3B1RVVncUx5QU8ya0VnelZwTjZwQVJxSnZVRks2TUQ0YzFmMnlxWGxwNXhrN2dFSnIKUzQ4WmF6d0RmWUVmV3Jrdld1YWdvZ1M2SktvbjVEZ0Z1ZHhINXM2Snl6R3lPVnZ0eG1TY2FvOHNxaCs3UXkybgoyLzFVcU5ZK0hlN0x4d04rYkhwYkIxNUtIMTU5ZHNuS3BRbjRORG1jSTZrVnJ3MDVJMUg5ZGRBbGF0bz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
 airship_config_client_cert_data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQwRENDQXJnQ0ZFdFBveEZYSjVrVFNWTXQ0OVlqcHBQL3hCYnlNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1CVXgKRXpBUkJnTlZCQU1UQ210MVltVnlibVYwWlhNd0hoY05NakF3TVRJME1Ua3hOVEV3V2hjTk1qa3hNakF5TVRreApOVEV3V2pBME1Sa3dGd1lEVlFRRERCQnJkV0psY201bGRHVnpMV0ZrYldsdU1SY3dGUVlEVlFRS0RBNXplWE4wClpXMDZiV0Z6ZEdWeWN6Q0NBaUl3RFFZSktvWklodmNOQVFFQkJRQURnZ0lQQURDQ0Fnb0NnZ0lCQU1iaFhUUmsKVjZiZXdsUjBhZlpBdTBGYWVsOXRtRThaSFEvaGtaSHhuTjc2bDZUUFltcGJvaDRvRjNGMFFqbzROS1o5NVRuWgo0OWNoV240eFJiZVlPU25EcDBpV0Qzd0pXUlZ5aVFvVUFyYTlNcHVPNkVFU1FpbFVGNXNxc0VXUVdVMjBETStBCkdxK1k0Z2c3eDJ1Q0hTdk1GUmkrNEw5RWlXR2xnRDIvb1hXUm5NWEswNExQajZPb3Vkb2Zid2RmT3J6dTBPVkUKUzR0eGtuS1BCY1BUU3YxMWVaWVhja0JEVjNPbExENEZ3dTB3NTcwcnczNzAraEpYdlZxd3Zjb2RjZjZEL1BXWQowamlnd2ppeUJuZ2dXYW04UVFjd1Nud3o0d05sV3hKOVMyWUJFb1ptdWxVUlFaWVk5ZXRBcEpBdFMzTjlUNlQ2ClovSlJRdEdhZDJmTldTYkxEck5qdU1OTGhBYWRMQnhJUHpBNXZWWk5aalJkdEMwU25pMlFUMTVpSFp4d1RxcjQKakRQQ0pYRXU3KytxcWpQVldUaUZLK3JqcVNhS1pqVWZVaUpHQkJWcm5RZkJENHNtRnNkTjB5cm9tYTZOYzRMNQpKS21RV1NHdmd1aG0zbW5sYjFRaVRZanVyZFJQRFNmdmwrQ0NHbnA1QkkvZ1pwMkF1SHMvNUpKVTJlc1ZvL0xsCkVPdHdSOXdXd3dXcTAvZjhXS3R4bVRrMTUyOUp2dFBGQXQweW1CVjhQbHZlYnVwYmJqeW5pL2xWbTJOYmV6dWUKeCtlMEpNbGtWWnFmYkRSS243SjZZSnJHWW1CUFV0QldoSVkzb1pJVTFEUXI4SUlIbkdmYlZoWlR5ME1IMkFCQQp1dlVQcUtSVk80UGkxRTF4OEE2eWVPeVRDcnB4L0pBazVyR2RBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBSWNFM1BxZHZDTVBIMnJzMXJESk9ESHY3QWk4S01PVXZPRi90RjlqR2EvSFBJbkh3RlVFNEltbldQeDYKVUdBMlE1bjFsRDFGQlU0T0M4eElZc3VvS1VQVHk1T0t6SVNMNEZnL0lEcG54STlrTXlmNStMR043aG8rblJmawpCZkpJblVYb0tERW1neHZzSWFGd1h6bGtSTDJzL1lKYUZRRzE1Uis1YzFyckJmd2dJOFA5Tkd6aEM1cXhnSmovCm04K3hPMGhXUmJIYklrQ21NekRib2pCSWhaL00rb3VYR1doei9TakpodXhZTVBnek5MZkFGcy9PMTVaSjd3YXcKZ3ZoSGc3L2E5UzRvUCtEYytPa3VrMkV1MUZjL0E5WHpWMzc5aWhNWW5ub3RQMldWeFZ3b0ZZQUg0NUdQcDZsUApCQmwyNnkxc2JMbjl6aGZYUUJIMVpFN0EwZVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
diff --git a/tools/deployment/update-krm-images b/tools/deployment/update-krm-images
index e08c30799..626c25956 100755
--- a/tools/deployment/update-krm-images
+++ b/tools/deployment/update-krm-images
@@ -17,9 +17,9 @@
 # under the License.
 set -xe
 export MANIFEST_DIR=${MANIFEST_DIR:-"$(pwd)"}
-export OLD_REPLACEMENT_TRANSFORMER=${OLD_REPLACEMENT_TRANSFORMER:-"quay.io/airshipit/replacement-transformer:v2"}
-export OLD_TEMPLATER=${OLD_TEMPLATER:-"quay.io/airshipit/templater:v2"}
-export OLD_CLOUD_INIT=${OLD_CLOUD_INIT:-"quay.io/airshipit/cloud-init:v2"}
+export OLD_REPLACEMENT_TRANSFORMER=${OLD_REPLACEMENT_TRANSFORMER:-"quay.io/airshipit/replacement-transformer:v2.0.2"}
+export OLD_TEMPLATER=${OLD_TEMPLATER:-"quay.io/airshipit/templater:v2.0.2"}
+export OLD_CLOUD_INIT=${OLD_CLOUD_INIT:-"quay.io/airshipit/cloud-init:v2.0.2"}
 export OLD_SOPS=${OLD_SOPS:-"gcr.io/kpt-fn-contrib/sops:v0.1.0"}
 export NEW_REPLACEMENT_TRANSFORMER=${NEW_REPLACEMENT_TRANSFORMER:-$OLD_REPLACEMENT_TRANSFORMER}
 export NEW_TEMPLATER=${NEW_TEMPLATER:-$OLD_TEMPLATER}