diff --git a/manifests/function/hostconfig-operator/replacements/kustomization.yaml b/manifests/function/hostconfig-operator/replacements/kustomization.yaml
index bb1a72699..908acd7fb 100644
--- a/manifests/function/hostconfig-operator/replacements/kustomization.yaml
+++ b/manifests/function/hostconfig-operator/replacements/kustomization.yaml
@@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ssh-key-replacement.yaml
+  - versions.yaml
diff --git a/manifests/function/hostconfig-operator/replacements/versions.yaml b/manifests/function/hostconfig-operator/replacements/versions.yaml
new file mode 100644
index 000000000..af71530bb
--- /dev/null
+++ b/manifests/function/hostconfig-operator/replacements/versions.yaml
@@ -0,0 +1,20 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: airship-host-config-version-replacement
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:v2
+replacements:
+# Container versions for the airship-host-config Deployment
+- source:
+    objref:
+      kind: VariableCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.images.airship-host-config.airship-host-config.image}"
+  target:
+    objref:
+      kind: Deployment
+      name: airship-host-config
+    fieldrefs: ["{.spec.template.spec.containers[?(.name == 'airship-host-config')].image}"]
diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
index f1e754c84..e3f14a9f9 100644
--- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
+++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
@@ -47,6 +47,9 @@ spec:
     grafana:
       repository: grafana/grafana
       tag: 7.4.5
+    airship-host-config:
+      airship-host-config:
+        image: quay.io/airshipit/hostconfig-operator:latest
     kube_prometheus_stack:
       admission_webhooks:
         repository: jettech/kube-webhook-certgen
diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml
index eefc27230..5669403d8 100644
--- a/manifests/site/test-site/target/initinfra/kustomization.yaml
+++ b/manifests/site/test-site/target/initinfra/kustomization.yaml
@@ -3,6 +3,5 @@ resources:
   - ../catalogues
 transformers:
   - ../../../../type/airship-core/target/initinfra/replacements
-  - ../../../../function/hostconfig-operator/replacements
   - ../../../../../../airshipctl/manifests/function/flux/source-controller/replacements
   - ../../../../../../airshipctl/manifests/function/flux/helm-controller/replacements
diff --git a/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml b/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml
index c9782b747..7f281104b 100644
--- a/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml
+++ b/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml
@@ -1,3 +1,5 @@
 resources:
   - ../../../../../../../airshipctl/manifests/function/baremetal-operator/replacements
   - ../../../../../../../airshipctl/manifests/function/hwcc/replacements
+  - ../../../../../../../airshipctl/manifests/function/helm-chart-collator/replacements
+  - ../../../../../function/hostconfig-operator/replacements
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 32f6c0f32..4853ee87d 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -14,7 +14,7 @@
     vars:
       # NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
       # the cloned version of airshipctl to a known/compatible reference.
-      AIRSHIPCTL_REF: "892bb6a16d53a0f43571284db83901bef53ed440"
+      AIRSHIPCTL_REF: "63c1faf718fd3341fc5bd975e575e3cf41647206"
       sphinx_build_dir: docs/build
     check:
       jobs: