diff --git a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
index f8af103d2..be71de4c6 100644
--- a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
+++ b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
@@ -27,3 +27,9 @@ patches: |-
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml
index f8af103d2..be71de4c6 100644
--- a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml
+++ b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml
@@ -27,3 +27,9 @@ patches: |-
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/test-site/target/workload/kustomization.yaml
index bf8114060..1f16e8c1c 100644
--- a/manifests/site/test-site/target/workload/kustomization.yaml
+++ b/manifests/site/test-site/target/workload/kustomization.yaml
@@ -1,2 +1,5 @@
 resources:
   - ../../../../type/airship-core/target/workload
+  - ../catalogues
+transformers:
+  - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml
index cf207361f..8d078e28e 100644
--- a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml
+++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml
@@ -33,3 +33,9 @@ patches: |-
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml b/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml
index f8af103d2..be71de4c6 100644
--- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml
+++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml
@@ -27,3 +27,9 @@ patches: |-
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml
index cf207361f..8d078e28e 100644
--- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml
+++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml
@@ -33,3 +33,9 @@ patches: |-
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml b/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml
index f8af103d2..be71de4c6 100644
--- a/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml
+++ b/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml
@@ -27,3 +27,9 @@ patches: |-
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml
index 561cbc571..eb9e7e9b5 100644
--- a/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml
+++ b/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml
@@ -29,7 +29,13 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete
+  ---
+  apiVersion: airshipit.org/v1alpha1
+  kind: VersionsCatalogue
+  metadata:
+    name: versions-treasuremap
+  $patch: delete
diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml
index bf8114060..f243c2aae 100644
--- a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml
+++ b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml
@@ -1,2 +1,5 @@
 resources:
-  - ../../../../type/airship-core/target/workload
+  - ../../../../type/multi-tenant/target/workload
+  - ../catalogues
+transformers:
+  - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
diff --git a/manifests/type/airship-core/shared/catalogues/kustomization.yaml b/manifests/type/airship-core/shared/catalogues/kustomization.yaml
index b521302a3..72a356a1f 100644
--- a/manifests/type/airship-core/shared/catalogues/kustomization.yaml
+++ b/manifests/type/airship-core/shared/catalogues/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues
+  - ../../../../function/treasuremap-base-catalogues
 patchesStrategicMerge:
   - networking.yaml
 # Uncomment to patch versions catalogue once needed
diff --git a/manifests/type/airship-core/target/workload/kustomization.yaml b/manifests/type/airship-core/target/workload/kustomization.yaml
index 5e84d10fd..6b52294c8 100644
--- a/manifests/type/airship-core/target/workload/kustomization.yaml
+++ b/manifests/type/airship-core/target/workload/kustomization.yaml
@@ -1,6 +1,2 @@
 resources:
-  - ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues
   - ../../../../../../airshipctl/manifests/type/gating/target/workload
-
-transformers:
-  - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
diff --git a/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml b/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml
index e05513347..74b8707df 100644
--- a/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml
+++ b/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml
@@ -9,4 +9,3 @@ resources:
 # Uncomment to patch versions catalogue once needed
 # patchesStrategicMerge:
 #   - versions.yaml
-