diff --git a/apps/templates/application-crds.yaml b/apps/templates/application-crds.yaml
index 06c55d3..32686dc 100644
--- a/apps/templates/application-crds.yaml
+++ b/apps/templates/application-crds.yaml
@@ -11,7 +11,7 @@ spec:
     server: {{ .Values.spec.destination.server }}
   project: default
   source:
-    path: volvo-kustomize/dev
+    path: volvo-kustomize/dev/application-crds
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
 
diff --git a/apps/templates/application.yaml b/apps/templates/application.yaml
index 2099765..56b934f 100644
--- a/apps/templates/application.yaml
+++ b/apps/templates/application.yaml
@@ -11,6 +11,6 @@ spec:
     server: {{ .Values.spec.destination.server }}
   project: default
   source:
-    path: volvo-kustomize/dev
+    path: volvo-kustomize/dev/application
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
diff --git a/apps/templates/istio-crds.yaml b/apps/templates/istio-crds.yaml
index 8093b1b..e6e1b7d 100644
--- a/apps/templates/istio-crds.yaml
+++ b/apps/templates/istio-crds.yaml
@@ -11,7 +11,7 @@ spec:
     server: {{ .Values.spec.destination.server }}
   project: default
   source:
-    path: volvo-kustomize/dev
+    path: volvo-kustomize/dev/istio-crds
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
 
diff --git a/apps/templates/istio-install.yaml b/apps/templates/istio-install.yaml
index 01d8f8a..032c831 100644
--- a/apps/templates/istio-install.yaml
+++ b/apps/templates/istio-install.yaml
@@ -11,7 +11,7 @@ spec:
     server: {{ .Values.spec.destination.server }}
   project: default
   source:
-    path: volvo-kustomize/dev
+    path: volvo-kustomize/dev/istio-install
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
 
diff --git a/apps/templates/istio.yaml b/apps/templates/istio.yaml
index 5fb1e2a..a047741 100644
--- a/apps/templates/istio.yaml
+++ b/apps/templates/istio.yaml
@@ -11,6 +11,6 @@ spec:
     server: {{ .Values.spec.destination.server }}
   project: default
   source:
-    path: volvo-kustomize/dev
+    path: volvo-kustomize/dev/istio
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
diff --git a/apps/templates/jupyter-web-app.yaml b/apps/templates/jupyter-web-app.yaml
index 1a73da1..cef1b24 100644
--- a/apps/templates/jupyter-web-app.yaml
+++ b/apps/templates/jupyter-web-app.yaml
@@ -11,6 +11,6 @@ spec:
     server: {{ .Values.spec.destination.server }}
   project: default
   source:
-    path: volvo-kustomize/dev
+    path: volvo-kustomize/dev/jupyter-web-app
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
diff --git a/volvo-kustomize/dev/application-crds/kustomization.yaml b/volvo-kustomize/dev/application-crds/kustomization.yaml
index afae8e4..7849f41 100644
--- a/volvo-kustomize/dev/application-crds/kustomization.yaml
+++ b/volvo-kustomize/dev/application-crds/kustomization.yaml
@@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 bases:
 - ../../../kustomize/application-crds
 kind: Kustomization
-namespace: kubeflow
-
 
 
 
diff --git a/volvo-kustomize/dev/application/kustomization.yaml b/volvo-kustomize/dev/application/kustomization.yaml
index 2e955e3..7252f26 100644
--- a/volvo-kustomize/dev/application/kustomization.yaml
+++ b/volvo-kustomize/dev/application/kustomization.yaml
@@ -2,8 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 bases:
 - ../../../kustomize/application
 kind: Kustomization
-namespace: kubeflow
-namePrefix: application1
+
 
 
 
diff --git a/volvo-kustomize/dev/istio-crds/kustomization.yaml b/volvo-kustomize/dev/istio-crds/kustomization.yaml
new file mode 100644
index 0000000..0249014
--- /dev/null
+++ b/volvo-kustomize/dev/istio-crds/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+bases:
+- ../../../kustomize/istio-crds
+kind: Kustomization
+
+
diff --git a/volvo-kustomize/dev/istio-install/kustomization.yaml b/volvo-kustomize/dev/istio-install/kustomization.yaml
new file mode 100644
index 0000000..94ae0e7
--- /dev/null
+++ b/volvo-kustomize/dev/istio-install/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+bases:
+- ../../../kustomize/istio-install
+kind: Kustomization
diff --git a/volvo-kustomize/dev/istio/kustomization.yaml b/volvo-kustomize/dev/istio/kustomization.yaml
new file mode 100644
index 0000000..0d9c165
--- /dev/null
+++ b/volvo-kustomize/dev/istio/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+bases:
+- ../../../kustomize/istio
+kind: Kustomization
+
+