diff --git a/template/stacks/core/crossplane-providers.yaml b/template/stacks/core/crossplane-providers.yaml
index 7970fef..2ff859e 100644
--- a/template/stacks/core/crossplane-providers.yaml
+++ b/template/stacks/core/crossplane-providers.yaml
@@ -1,3 +1,4 @@
+{{]] if eq .Env.CLUSTER_TYPE "kind" [[}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -19,3 +20,4 @@ spec:
     path: stacks/core/crossplane-providers
     repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder
     targetRevision: HEAD
+{{]] end [[}}
diff --git a/template/stacks/core/ingress-nginx/values.osc.yaml b/template/stacks/core/ingress-nginx/values.osc.yaml
deleted file mode 100644
index 872c826..0000000
--- a/template/stacks/core/ingress-nginx/values.osc.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-controller:
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-
-  ingressClassResource:
-    name: nginx
-
-  # added for idpbuilder
-  allowSnippetAnnotations: true
-
-  # added for idpbuilder
-  config: 
-    proxy-buffer-size: 32k
-    use-forwarded-headers: "true"
diff --git a/template/stacks/core/ingress-nginx/values.kind.yaml b/template/stacks/core/ingress-nginx/values.yaml
similarity index 87%
rename from template/stacks/core/ingress-nginx/values.kind.yaml
rename to template/stacks/core/ingress-nginx/values.yaml
index 7930bc9..b823552 100644
--- a/template/stacks/core/ingress-nginx/values.kind.yaml
+++ b/template/stacks/core/ingress-nginx/values.yaml
@@ -3,12 +3,24 @@ controller:
     type: RollingUpdate
     rollingUpdate:
       maxUnavailable: 1
+
+  ingressClassResource:
+    name: nginx
+
+  # added for idpbuilder
+  allowSnippetAnnotations: true
+
+  # added for idpbuilder
+  config:
+    proxy-buffer-size: 32k
+    use-forwarded-headers: "true"
+
+{{]] if eq .Env.CLUSTER_TYPE "kind" [[}}
   hostPort:
     enabled: true
   terminationGracePeriodSeconds: 0
   service:
     type: NodePort
-  watchIngressWithoutClass: true
 
   nodeSelector:
     ingress-ready: "true"
@@ -26,11 +38,4 @@ controller:
     publish-status-address: localhost
     # added for idpbuilder
     enable-ssl-passthrough: ""
-
-  # added for idpbuilder
-  allowSnippetAnnotations: true
-
-  # added for idpbuilder
-  config: 
-    proxy-buffer-size: 32k
-    use-forwarded-headers: "true"
+{{]] end [[}}
diff --git a/template/stacks/ref-implementation/metric-server.yaml b/template/stacks/ref-implementation/metric-server.yaml
index 3c8699b..e7fde0b 100644
--- a/template/stacks/ref-implementation/metric-server.yaml
+++ b/template/stacks/ref-implementation/metric-server.yaml
@@ -1,3 +1,4 @@
+{{]] if eq .Env.CLUSTER_TYPE "kind" [[}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -27,3 +28,4 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+{{]] end [[}}