diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
index 4dbb68ffe..54a755210 100644
--- a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
@@ -1,16 +1,12 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  # TODO: these two should move up to type level in the future
-  - ../../../../../function/hostgenerator-m3
-  - ../../../../../function/hardwareprofile-example
+  - ../../../../../type/gating/ephemeral/bootstrap/hostgenerator
   - ../../catalogues
   - host-generation.yaml
 
 transformers:
-  # TODO: these two should move up to type level in the future
-  - ../../../../../function/hostgenerator-m3/replacements
-  - ../../../../../function/hardwareprofile-example/replacements
+  - ../../../../../type/gating/ephemeral/bootstrap/hostgenerator/replacements
   # 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
diff --git a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
index 05516ad8b..76e57d747 100644
--- a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
-  - ../../../../function/ephemeral
+  - ../../../../type/gating/ephemeral/bootstrap
   - ../catalogues
 
 namespace: target-infra
@@ -14,4 +14,4 @@ patchesStrategicMerge:
   - baremetalhost.yaml
 
 transformers:
-  - ../../../../function/ephemeral/replacements
+  - ../../../../type/gating/ephemeral/bootstrap/replacements
diff --git a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml b/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
index 75dcb3ee6..f831ecd02 100644
--- a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
@@ -3,11 +3,11 @@ kind: Kustomization
 resources:
   # TODO (dukov) It's recocommended to upload BareMetalHost objects separately
   # otherwise nodes will hang in 'registering' state for quite a long time
-  - ../../../../function/k8scontrol
+  - ../../../../type/gating/ephemeral/controlplane
   - ../../target/catalogues # NOTE: use target networking for this phase
   - nodes
 
 namespace: target-infra
 
 transformers:
-  - ../../../../function/k8scontrol/replacements
+  - ../../../../type/gating/ephemeral/controlplane/replacements
diff --git a/manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml b/manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml
index 5f471cde1..82440cc0c 100644
--- a/manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml
@@ -1,9 +1,6 @@
 resources:
   - ../catalogues
-  - ../../../../composite/infra/
-
-commonLabels:
-  airshipit.org/stage: initinfra
+  - ../../../../type/gating/ephemeral/initinfra-networking
 
 transformers:
-  - ../../../../composite/infra/replacements
+  - ../../../../type/gating/ephemeral/initinfra-networking/replacements
diff --git a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
index 79b803c38..b7e4a27c5 100644
--- a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
@@ -1,11 +1,6 @@
 resources:
-  - ../../../../function/baremetal-operator
-  - ../../../../function/hwcc
-  - ../../../../function/clusterctl
+  - ../../../../type/gating/ephemeral/initinfra
   - ../catalogues
 
-commonLabels:
-  airshipit.org/stage: initinfra
-
 transformers:
-  - ../../../../function/baremetal-operator/replacements
+  - ../../../../type/gating/ephemeral/initinfra/replacements
diff --git a/manifests/site/test-site/target/controlplane/kustomization.yaml b/manifests/site/test-site/target/controlplane/kustomization.yaml
index 085fab0d0..0608f5b46 100644
--- a/manifests/site/test-site/target/controlplane/kustomization.yaml
+++ b/manifests/site/test-site/target/controlplane/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 resources:
   # TODO (dukov) It's recocommended to upload BareMetalHost objects separately
   # otherwise nodes will hang in 'registering' state for quite a long time
-  - nodes
-  - ../../../../function/k8scontrol
+  - ../../../../type/gating/target/controlplane
   - ../catalogues
+  - nodes
 
 namespace: target-infra
 
@@ -13,4 +13,4 @@ commonLabels:
   airshipit.org/stage: initinfra
 
 transformers:
-  - ../../../../function/k8scontrol/replacements
+  - ../../../../type/gating/target/controlplane/replacements
diff --git a/manifests/site/test-site/target/initinfra-networking/kustomization.yaml b/manifests/site/test-site/target/initinfra-networking/kustomization.yaml
index 256a7e540..eb199910c 100644
--- a/manifests/site/test-site/target/initinfra-networking/kustomization.yaml
+++ b/manifests/site/test-site/target/initinfra-networking/kustomization.yaml
@@ -1,11 +1,6 @@
 resources:
   - ../catalogues
-  - ../../../../composite/infra/
-  - namespace.yaml
-
-commonLabels:
-  airshipit.org/stage: initinfra
+  - ../../../../type/gating/target/initinfra-networking
 
 transformers:
-  - ../../../../composite/infra/replacements
-
+  - ../../../../type/gating/target/initinfra-networking/replacements
diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml
index eee5654b8..9133d61d1 100644
--- a/manifests/site/test-site/target/initinfra/kustomization.yaml
+++ b/manifests/site/test-site/target/initinfra/kustomization.yaml
@@ -1,13 +1,6 @@
 resources:
-  - ../../../../function/baremetal-operator
-  - ../../../../function/hwcc
-  - ../../../../function/clusterctl
-  - ../../../../composite/flux-helm
+  - ../../../../type/gating/target/initinfra
   - ../catalogues
 
-commonLabels:
-  airshipit.org/stage: initinfra
-
 transformers:
-  - ../../../../function/baremetal-operator/replacements
-  - ../../../../composite/flux-helm/replacements
+  - ../../../../type/gating/target/initinfra/replacements
diff --git a/manifests/site/test-site/target/workers/kustomization.yaml b/manifests/site/test-site/target/workers/kustomization.yaml
index fd4c58993..b006ab3b1 100644
--- a/manifests/site/test-site/target/workers/kustomization.yaml
+++ b/manifests/site/test-site/target/workers/kustomization.yaml
@@ -2,11 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../catalogues
-  - ../../../../function/workers-capm3/
+  - ../../../../type/gating/target/workers
   - nodes
 
 namespace: target-infra
 
 transformers:
-  - ../../../../function/workers-capm3/replacements
-  - ../../../../function/workers-capm3/replacements-secrets
+  - ../../../../type/gating/target/workers/replacements
diff --git a/manifests/type/gating/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/type/gating/ephemeral/bootstrap/hostgenerator/kustomization.yaml
new file mode 100644
index 000000000..d25fe6e1c
--- /dev/null
+++ b/manifests/type/gating/ephemeral/bootstrap/hostgenerator/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/hostgenerator-m3
+  - ../../../../../function/hardwareprofile-example
diff --git a/manifests/type/gating/ephemeral/bootstrap/hostgenerator/replacements/kustomization.yaml b/manifests/type/gating/ephemeral/bootstrap/hostgenerator/replacements/kustomization.yaml
new file mode 100644
index 000000000..37de3fb08
--- /dev/null
+++ b/manifests/type/gating/ephemeral/bootstrap/hostgenerator/replacements/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../../function/hostgenerator-m3/replacements
+  - ../../../../../../function/hardwareprofile-example/replacements
diff --git a/manifests/type/gating/ephemeral/bootstrap/kustomization.yaml b/manifests/type/gating/ephemeral/bootstrap/kustomization.yaml
new file mode 100644
index 000000000..26ccffa44
--- /dev/null
+++ b/manifests/type/gating/ephemeral/bootstrap/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../function/ephemeral
\ No newline at end of file
diff --git a/manifests/type/gating/ephemeral/bootstrap/replacements/kustomization.yaml b/manifests/type/gating/ephemeral/bootstrap/replacements/kustomization.yaml
new file mode 100644
index 000000000..52875c0d5
--- /dev/null
+++ b/manifests/type/gating/ephemeral/bootstrap/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/ephemeral/replacements
diff --git a/manifests/type/gating/ephemeral/controlplane/kustomization.yaml b/manifests/type/gating/ephemeral/controlplane/kustomization.yaml
new file mode 100644
index 000000000..58caebdd9
--- /dev/null
+++ b/manifests/type/gating/ephemeral/controlplane/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../function/k8scontrol
diff --git a/manifests/type/gating/ephemeral/controlplane/replacements/kustomization.yaml b/manifests/type/gating/ephemeral/controlplane/replacements/kustomization.yaml
new file mode 100644
index 000000000..1294fb085
--- /dev/null
+++ b/manifests/type/gating/ephemeral/controlplane/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/k8scontrol/replacements
\ No newline at end of file
diff --git a/manifests/type/gating/ephemeral/initinfra-networking/kustomization.yaml b/manifests/type/gating/ephemeral/initinfra-networking/kustomization.yaml
new file mode 100644
index 000000000..7c3f6126c
--- /dev/null
+++ b/manifests/type/gating/ephemeral/initinfra-networking/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../composite/infra/
+
+commonLabels:
+  airshipit.org/stage: initinfra
diff --git a/manifests/type/gating/ephemeral/initinfra-networking/replacements/kustomization.yaml b/manifests/type/gating/ephemeral/initinfra-networking/replacements/kustomization.yaml
new file mode 100644
index 000000000..5b5cfbfd2
--- /dev/null
+++ b/manifests/type/gating/ephemeral/initinfra-networking/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  -  ../../../../../composite/infra/replacements
\ No newline at end of file
diff --git a/manifests/type/gating/ephemeral/initinfra/kustomization.yaml b/manifests/type/gating/ephemeral/initinfra/kustomization.yaml
new file mode 100644
index 000000000..a84bf7d66
--- /dev/null
+++ b/manifests/type/gating/ephemeral/initinfra/kustomization.yaml
@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../function/baremetal-operator
+  - ../../../../function/hwcc
+  - ../../../../function/clusterctl
+
+commonLabels:
+  airshipit.org/stage: initinfra
diff --git a/manifests/type/gating/ephemeral/initinfra/replacements/kustomization.yaml b/manifests/type/gating/ephemeral/initinfra/replacements/kustomization.yaml
new file mode 100644
index 000000000..f59c18fb3
--- /dev/null
+++ b/manifests/type/gating/ephemeral/initinfra/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/baremetal-operator/replacements
\ No newline at end of file
diff --git a/manifests/type/gating/target/controlplane/kustomization.yaml b/manifests/type/gating/target/controlplane/kustomization.yaml
new file mode 100644
index 000000000..58caebdd9
--- /dev/null
+++ b/manifests/type/gating/target/controlplane/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../function/k8scontrol
diff --git a/manifests/type/gating/target/controlplane/replacements/kustomization.yaml b/manifests/type/gating/target/controlplane/replacements/kustomization.yaml
new file mode 100644
index 000000000..dce843526
--- /dev/null
+++ b/manifests/type/gating/target/controlplane/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/k8scontrol/replacements
diff --git a/manifests/type/gating/target/initinfra-networking/kustomization.yaml b/manifests/type/gating/target/initinfra-networking/kustomization.yaml
new file mode 100644
index 000000000..d709b7166
--- /dev/null
+++ b/manifests/type/gating/target/initinfra-networking/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../composite/infra/
+  - namespace.yaml
+
+commonLabels:
+  airshipit.org/stage: initinfra
diff --git a/manifests/site/test-site/target/initinfra-networking/namespace.yaml b/manifests/type/gating/target/initinfra-networking/namespace.yaml
similarity index 100%
rename from manifests/site/test-site/target/initinfra-networking/namespace.yaml
rename to manifests/type/gating/target/initinfra-networking/namespace.yaml
diff --git a/manifests/type/gating/target/initinfra-networking/replacements/kustomization.yaml b/manifests/type/gating/target/initinfra-networking/replacements/kustomization.yaml
new file mode 100644
index 000000000..de4869ff6
--- /dev/null
+++ b/manifests/type/gating/target/initinfra-networking/replacements/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../composite/infra/replacements
diff --git a/manifests/type/gating/target/initinfra/kustomization.yaml b/manifests/type/gating/target/initinfra/kustomization.yaml
new file mode 100644
index 000000000..772205430
--- /dev/null
+++ b/manifests/type/gating/target/initinfra/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../function/baremetal-operator
+  - ../../../../function/hwcc
+  - ../../../../function/clusterctl
+  - ../../../../composite/flux-helm
+
+commonLabels:
+  airshipit.org/stage: initinfra
diff --git a/manifests/type/gating/target/initinfra/replacements/kustomization.yaml b/manifests/type/gating/target/initinfra/replacements/kustomization.yaml
new file mode 100644
index 000000000..63a6e45d5
--- /dev/null
+++ b/manifests/type/gating/target/initinfra/replacements/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/baremetal-operator/replacements
+  - ../../../../../composite/flux-helm/replacements
diff --git a/manifests/type/gating/target/workers/kustomization.yaml b/manifests/type/gating/target/workers/kustomization.yaml
new file mode 100644
index 000000000..d4d784adb
--- /dev/null
+++ b/manifests/type/gating/target/workers/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../function/workers-capm3/
diff --git a/manifests/type/gating/target/workers/replacements/kustomization.yaml b/manifests/type/gating/target/workers/replacements/kustomization.yaml
new file mode 100644
index 000000000..6b7b90fa9
--- /dev/null
+++ b/manifests/type/gating/target/workers/replacements/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../function/workers-capm3/replacements
+  - ../../../../../function/workers-capm3/replacements-secrets