diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
index 49a0ba01d..08912ada8 100644
--- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
+++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
@@ -84,6 +84,14 @@ spec:
         tag: v0.4.1
 
   images:
+    # images are organized by
+    #   <function>:
+    #     <component>:
+    #       <container>:
+    helm_chart_collator:
+      helm_chart_collator:
+        helm_chart_collator:
+          image: quay.io/airshipit/helm-chart-collator:latest
     baremetal_operator:
       ironic: # ironic Deployment
         init_bootstrap:
@@ -120,6 +128,10 @@ spec:
       kube_controllers: # calico-kube-controllers Deployment
         calico_kube_controllers:
           image: quay.io/calico/kube-controllers:v3.15.1
+    tigera_operator:
+      tigera_operator:
+        repository:
+          image: quay.io/tigera/operator:v1.15.0
     hwcc:
       manager: # controller-manager Deployment
         manager:
diff --git a/manifests/function/cni/tigera-operator/replacements/kustomization.yaml b/manifests/function/cni/tigera-operator/replacements/kustomization.yaml
new file mode 100644
index 000000000..cce41d7ba
--- /dev/null
+++ b/manifests/function/cni/tigera-operator/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - versions.yaml
\ No newline at end of file
diff --git a/manifests/function/cni/tigera-operator/replacements/versions.yaml b/manifests/function/cni/tigera-operator/replacements/versions.yaml
new file mode 100644
index 000000000..d7f447029
--- /dev/null
+++ b/manifests/function/cni/tigera-operator/replacements/versions.yaml
@@ -0,0 +1,19 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: tigera-operator-versions-replacements
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:v2
+replacements:
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-airshipctl
+    fieldref: "{.spec.images.tigera_operator.tigera_operator.repository.image}"
+  target:
+    objref:
+      kind: Deployment
+      name: tigera-operator
+    fieldrefs: ["{.spec.template.spec.containers[?(.name == 'tigera-operator')].image}"]
\ No newline at end of file
diff --git a/manifests/function/helm-chart-collator/replacements/kustomization.yaml b/manifests/function/helm-chart-collator/replacements/kustomization.yaml
new file mode 100644
index 000000000..cce41d7ba
--- /dev/null
+++ b/manifests/function/helm-chart-collator/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - versions.yaml
\ No newline at end of file
diff --git a/manifests/function/helm-chart-collator/replacements/versions.yaml b/manifests/function/helm-chart-collator/replacements/versions.yaml
new file mode 100644
index 000000000..e31766dcc
--- /dev/null
+++ b/manifests/function/helm-chart-collator/replacements/versions.yaml
@@ -0,0 +1,19 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: helm-chart-collator-versions-replacements
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:v2
+replacements:
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-airshipctl
+    fieldref: "{.spec.images.helm_chart_collator.helm_chart_collator.helm_chart_collator.image}"
+  target:
+    objref:
+      kind: Deployment
+      name: helm-chart-collator
+    fieldrefs: ["{.spec.template.spec.containers[?(.name == 'helm-chart-collator')].image}"]
\ No newline at end of file