diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
index 3824d2cca..11167c6c3 100644
--- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
+++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
@@ -10,8 +10,6 @@ spec:
   helm_repositories:
     ingress-nginx:
       url: https://kubernetes.github.io/ingress-nginx
-    helm_chart_collator:
-      url: http://helm-chart-collator.collator.svc:8080
 
   charts:
     ingress-nginx:
@@ -90,10 +88,6 @@ spec:
     #   <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:
diff --git a/manifests/function/helm-chart-collator/helm-chart-collator.yaml b/manifests/function/helm-chart-collator/helm-chart-collator.yaml
deleted file mode 100644
index 9cd3c231b..000000000
--- a/manifests/function/helm-chart-collator/helm-chart-collator.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: helm-chart-collator
-spec:
-  selector:
-    matchLabels:
-      app: helm-chart-collator
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        app: helm-chart-collator
-    spec:
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
-      containers:
-      - name: helm-chart-collator
-        image: quay.io/airshipit/helm-chart-collator:latest
-        ports:
-        - containerPort: 8080
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: helm-chart-collator
-  name: helm-chart-collator
-spec:
-  ports:
-  - port: 8080
-    targetPort: 8080
-  selector:
-    app: helm-chart-collator
-  type: ClusterIP
\ No newline at end of file
diff --git a/manifests/function/helm-chart-collator/kustomization.yaml b/manifests/function/helm-chart-collator/kustomization.yaml
deleted file mode 100644
index 51831340d..000000000
--- a/manifests/function/helm-chart-collator/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - namespace.yaml
-  - helm-chart-collator.yaml
-namespace: helm-chart-collator
\ No newline at end of file
diff --git a/manifests/function/helm-chart-collator/namespace.yaml b/manifests/function/helm-chart-collator/namespace.yaml
deleted file mode 100644
index 38e416e9e..000000000
--- a/manifests/function/helm-chart-collator/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: helm-chart-collator
\ 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
deleted file mode 100644
index cce41d7ba..000000000
--- a/manifests/function/helm-chart-collator/replacements/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index c44ee59bc..000000000
--- a/manifests/function/helm-chart-collator/replacements/versions.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: airshipit.org/v1alpha1
-kind: ReplacementTransformer
-metadata:
-  name: helm-chart-collator-versions-replacements
-  annotations:
-    config.kubernetes.io/function: |-
-      container:
-        image: localhost/replacement-transformer
-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
diff --git a/manifests/function/helm-chart-repository/helm-repository.yaml b/manifests/function/helm-chart-repository/helm-repository.yaml
deleted file mode 100644
index be0dcd150..000000000
--- a/manifests/function/helm-chart-repository/helm-repository.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Helm Charts from Helm Repository (Helm Collator)
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: collator
-  namespace: helm-chart-collator
-spec:
-  interval: 5m
-  url: http://helm-chart-collator.helm-chart-collator.svc:8080
\ No newline at end of file
diff --git a/manifests/function/helm-chart-repository/kustomization.yaml b/manifests/function/helm-chart-repository/kustomization.yaml
deleted file mode 100644
index 305e2fffd..000000000
--- a/manifests/function/helm-chart-repository/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - helm-repository.yaml
\ No newline at end of file
diff --git a/manifests/function/helm-chart-repository/replacements/kustomization.yaml b/manifests/function/helm-chart-repository/replacements/kustomization.yaml
deleted file mode 100644
index cce41d7ba..000000000
--- a/manifests/function/helm-chart-repository/replacements/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - versions.yaml
\ No newline at end of file
diff --git a/manifests/function/helm-chart-repository/replacements/versions.yaml b/manifests/function/helm-chart-repository/replacements/versions.yaml
deleted file mode 100644
index 55655fb34..000000000
--- a/manifests/function/helm-chart-repository/replacements/versions.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: airshipit.org/v1alpha1
-kind: ReplacementTransformer
-metadata:
-  name: helm-repository-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.helm_repositories.helm_chart_collator.url}"
-  target:
-    objref:
-      kind: HelmRepository
-      name: collator
-    fieldrefs: ["{.spec.url}"]