diff --git a/manifests/function/airshipctl-cleanup/kustomization.yaml b/manifests/function/airshipctl-cleanup/kustomization.yaml
new file mode 100644
index 000000000..06dc29332
--- /dev/null
+++ b/manifests/function/airshipctl-cleanup/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- patch.yaml
diff --git a/manifests/function/airshipctl-cleanup/patch.yaml b/manifests/function/airshipctl-cleanup/patch.yaml
new file mode 100644
index 000000000..177a402da
--- /dev/null
+++ b/manifests/function/airshipctl-cleanup/patch.yaml
@@ -0,0 +1,39 @@
+apiVersion: builtin
+kind: PatchTransformer
+metadata:
+  name: delete-variable-catalogues
+target:
+ kind: VariableCatalogue
+patch: |
+  apiVersion: not-important
+  kind: not-important
+  metadata:
+    name: not-important
+  $patch: delete
+---
+apiVersion: builtin
+kind: PatchTransformer
+metadata:
+  name: delete-versions-catalogues
+target:
+ kind: VersionsCatalogue
+patch: |
+  apiVersion: not-important
+  kind: not-important
+  metadata:
+    name: not-important
+  $patch: delete
+---
+apiVersion: builtin
+kind: PatchTransformer
+metadata:
+  name: delete-network-catalogues
+target:
+ kind: NetworkCatalogue
+patch: |
+  apiVersion: not-important
+  kind: not-important
+  metadata:
+    name: not-important
+  $patch: delete
+
diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
index 1d667255f..4dbb68ffe 100644
--- a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
@@ -14,6 +14,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
-  - ../../catalogues/cleanup
-  - ../../../../../function/hardwareprofile-example/cleanup
+  - ../../../../../function/airshipctl-cleanup/
diff --git a/manifests/site/test-site/ephemeral/catalogues/cleanup/kustomization.yaml b/manifests/site/test-site/ephemeral/catalogues/cleanup/kustomization.yaml
deleted file mode 100644
index db217834b..000000000
--- a/manifests/site/test-site/ephemeral/catalogues/cleanup/kustomization.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resources:
-- smp.yaml
-- ../../../target/generator/results/cleanup/
diff --git a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
deleted file mode 100644
index f8af103d2..000000000
--- a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: builtin
-kind: PatchStrategicMergeTransformer
-metadata:
-  name: smp
-patches: |-
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
-  metadata:
-    name: host-catalogue
-  $patch: delete
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: NetworkCatalogue
-  metadata:
-    name: networking
-  $patch: delete
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
-  metadata:
-    name: env-vars-catalogue
-  $patch: delete
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VersionsCatalogue
-  metadata:
-    name: versions-airshipctl
-  $patch: delete
diff --git a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml
index 1d667255f..4dbb68ffe 100644
--- a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml
@@ -14,6 +14,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
-  - ../../catalogues/cleanup
-  - ../../../../../function/hardwareprofile-example/cleanup
+  - ../../../../../function/airshipctl-cleanup/
diff --git a/manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml b/manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml
index e3d57f8d1..cb5e1f365 100644
--- a/manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml
+++ b/manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml
@@ -7,5 +7,4 @@ resources:
 
 transformers:
   - ../../../../function/hostgenerator-m3/replacements
-  - ../../../../function/hostgenerator-m3/cleanup
-  - ../../target/catalogues/cleanup
+  - ../../../../function/airshipctl-cleanup/
diff --git a/manifests/site/test-site/kubeconfig/kustomization.yaml b/manifests/site/test-site/kubeconfig/kustomization.yaml
index 5408ae7e9..026f08c66 100644
--- a/manifests/site/test-site/kubeconfig/kustomization.yaml
+++ b/manifests/site/test-site/kubeconfig/kustomization.yaml
@@ -4,4 +4,4 @@ resources:
 
 transformers:
   - update-target.yaml
-  - ../target/catalogues/cleanup
+  - ../../../function/airshipctl-cleanup/
diff --git a/manifests/site/test-site/target/catalogues/cleanup/kustomization.yaml b/manifests/site/test-site/target/catalogues/cleanup/kustomization.yaml
deleted file mode 100644
index 153dfff8b..000000000
--- a/manifests/site/test-site/target/catalogues/cleanup/kustomization.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resources:
-- smp.yaml
-- ../../generator/results/cleanup/
diff --git a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml
deleted file mode 100644
index f8af103d2..000000000
--- a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: builtin
-kind: PatchStrategicMergeTransformer
-metadata:
-  name: smp
-patches: |-
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
-  metadata:
-    name: host-catalogue
-  $patch: delete
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: NetworkCatalogue
-  metadata:
-    name: networking
-  $patch: delete
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
-  metadata:
-    name: env-vars-catalogue
-  $patch: delete
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VersionsCatalogue
-  metadata:
-    name: versions-airshipctl
-  $patch: delete
diff --git a/manifests/site/test-site/target/controlplane/hostgenerator/kustomization.yaml b/manifests/site/test-site/target/controlplane/hostgenerator/kustomization.yaml
index d7b824970..63764297a 100644
--- a/manifests/site/test-site/target/controlplane/hostgenerator/kustomization.yaml
+++ b/manifests/site/test-site/target/controlplane/hostgenerator/kustomization.yaml
@@ -12,6 +12,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
-  - ../../catalogues/cleanup
-  - ../../../../../function/hardwareprofile-example/cleanup
+  - ../../../../../function/airshipctl-cleanup/
diff --git a/manifests/site/test-site/target/generator/results/cleanup/kustomization.yaml b/manifests/site/test-site/target/generator/results/cleanup/kustomization.yaml
deleted file mode 100644
index 6dfa81441..000000000
--- a/manifests/site/test-site/target/generator/results/cleanup/kustomization.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resources:
-- override
diff --git a/manifests/site/test-site/target/generator/results/cleanup/override/kustomization.yaml b/manifests/site/test-site/target/generator/results/cleanup/override/kustomization.yaml
deleted file mode 100644
index 14e8aa723..000000000
--- a/manifests/site/test-site/target/generator/results/cleanup/override/kustomization.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resources:
-- ../../../../../../../type/gating/target/generator/cleanup/
diff --git a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml
index f1d15671a..15adc9ae1 100644
--- a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml
+++ b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml
@@ -10,5 +10,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
-  - ../../catalogues/cleanup
+  - ../../../../../function/airshipctl-cleanup/
diff --git a/manifests/type/gating/target/generator/cleanup/kustomization.yaml b/manifests/type/gating/target/generator/cleanup/kustomization.yaml
deleted file mode 100644
index 5d28ccd4a..000000000
--- a/manifests/type/gating/target/generator/cleanup/kustomization.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resources:
-- secret-cleanup.yaml
diff --git a/manifests/type/gating/target/generator/cleanup/secret-cleanup.yaml b/manifests/type/gating/target/generator/cleanup/secret-cleanup.yaml
deleted file mode 100644
index bf70e529f..000000000
--- a/manifests/type/gating/target/generator/cleanup/secret-cleanup.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: builtin
-kind: PatchStrategicMergeTransformer
-metadata:
-  name: smp_cleanup
-patches: |-
-  ---
-  apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
-  metadata:
-    name: generated-secrets
-  $patch: delete