diff --git a/helm-repositories/istio-charts/istio-charts.yaml b/helm-repositories/istio-charts/istio-charts.yaml
deleted file mode 100644
index 9c72459..0000000
--- a/helm-repositories/istio-charts/istio-charts.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: istio-release.storage.googleapis.com-helm-releases
-  namespace: ${workspaceNamespace}
-  labels:
-    kommander.d2iq.io/dkp-airgapped: supported
-spec:
-  url: https://istio-release.storage.googleapis.com/charts
-  interval: 10m
diff --git a/helm-repositories/istio-charts/kustomization.yaml b/helm-repositories/istio-charts/kustomization.yaml
deleted file mode 100644
index b941f31..0000000
--- a/helm-repositories/istio-charts/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - istio-charts.yaml
diff --git a/helm-repositories/kserve-crd/kserve-crd-charts.yaml b/helm-repositories/kserve-crd/kserve-crd-charts.yaml
deleted file mode 100644
index 4c33ee2..0000000
--- a/helm-repositories/kserve-crd/kserve-crd-charts.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: ghcr.io-kserve-crd-helm-releases
-  namespace: ${workspaceNamespace}
-  labels:
-    kommander.d2iq.io/dkp-airgapped: supported
-spec:
-  url: https://johnliu25.github.io/helm-charts
-  interval: 10m
diff --git a/helm-repositories/kserve-crd/kustomization.yaml b/helm-repositories/kserve-crd/kustomization.yaml
deleted file mode 100644
index 0053a8c..0000000
--- a/helm-repositories/kserve-crd/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - kserve-crd-charts.yaml
diff --git a/helm-repositories/kserve/kserve-charts.yaml b/helm-repositories/kserve/kserve-charts.yaml
deleted file mode 100644
index 0d4bdd4..0000000
--- a/helm-repositories/kserve/kserve-charts.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: ghcr.io-kserve-helm-releases
-  namespace: ${workspaceNamespace}
-  labels:
-    kommander.d2iq.io/dkp-airgapped: supported
-spec:
-  url: https://johnliu25.github.io/helm-charts
-  interval: 10m
diff --git a/helm-repositories/kustomization.yaml b/helm-repositories/kustomization.yaml
deleted file mode 100644
index 3755893..0000000
--- a/helm-repositories/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ntnx-charts
diff --git a/helm-repositories/ntnx-charts/kustomization.yaml b/helm-repositories/ntnx-charts/kustomization.yaml
deleted file mode 100644
index 4eacb10..0000000
--- a/helm-repositories/ntnx-charts/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ntnx-charts.yaml
diff --git a/helm-repositories/ntnx-charts/ntnx-charts.yaml b/helm-repositories/ntnx-charts/ntnx-charts.yaml
deleted file mode 100644
index 323c625..0000000
--- a/helm-repositories/ntnx-charts/ntnx-charts.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: nutanix.github.io-helm-releases
-  namespace: ${workspaceNamespace}
-  labels:
-    kommander.d2iq.io/dkp-airgapped: supported
-spec:
-  url: "${helmMirrorURL:=https://nutanix.github.io/helm-releases}"
-  interval: 10m
diff --git a/services/nutanix-ai/1.0.0/helmrelease/istio.yaml b/services/nutanix-ai/1.0.0/helmrelease/istio.yaml
new file mode 100644
index 0000000..3fc00a4
--- /dev/null
+++ b/services/nutanix-ai/1.0.0/helmrelease/istio.yaml
@@ -0,0 +1,90 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: istio-release.storage.googleapis.com-helm-releases
+  namespace: ${workspaceNamespace}
+  labels:
+    kommander.d2iq.io/dkp-airgapped: supported
+spec:
+  url: https://istio-release.storage.googleapis.com/charts
+  interval: 10m
+
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: istio-base
+  namespace: ${workspaceNamespace}
+spec:
+  chart:
+    spec:
+      chart: base
+      sourceRef:
+        kind: HelmRepository
+        name: istio-release.storage.googleapis.com-helm-releases
+        namespace: ${workspaceNamespace}
+      version: 1.23.2
+  interval: 15s
+  install:
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    remediation:
+      retries: 30
+  releaseName: istio-base
+  targetNamespace: istio-system
+
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: istiod
+  namespace: ${workspaceNamespace}
+spec:
+  chart:
+    spec:
+      chart: istiod
+      sourceRef:
+        kind: HelmRepository
+        name: istio-release.storage.googleapis.com-helm-releases
+        namespace: ${workspaceNamespace}
+      version: 1.23.2
+  interval: 15s
+  install:
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    remediation:
+      retries: 30
+  releaseName: istiod
+  targetNamespace: istio-system
+
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: istio-ingressgateway
+  namespace: ${workspaceNamespace}
+spec:
+  chart:
+    spec:
+      chart: gateway
+      sourceRef:
+        kind: HelmRepository
+        name: istio-release.storage.googleapis.com-helm-releases
+        namespace: ${workspaceNamespace}
+      version: 1.23.2
+  interval: 15s
+  install:
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    remediation:
+      retries: 30
+  releaseName: istio-ingressgateway
+  targetNamespace: istio-system
+
diff --git a/services/nutanix-ai/1.0.0/helmrelease/kserve.yaml b/services/nutanix-ai/1.0.0/helmrelease/kserve.yaml
new file mode 100644
index 0000000..a3701c5
--- /dev/null
+++ b/services/nutanix-ai/1.0.0/helmrelease/kserve.yaml
@@ -0,0 +1,82 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: ghcr.io-kserve-crd-helm-releases
+  namespace: ${workspaceNamespace}
+  labels:
+    kommander.d2iq.io/dkp-airgapped: supported
+spec:
+  url: https://johnliu25.github.io/helm-charts
+  interval: 10m
+
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: ghcr.io-kserve-helm-releases
+  namespace: ${workspaceNamespace}
+  labels:
+    kommander.d2iq.io/dkp-airgapped: supported
+spec:
+  url: https://johnliu25.github.io/helm-charts
+  interval: 10m
+
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: kserve-crd
+  namespace: ${workspaceNamespace}
+spec:
+  chart:
+    spec:
+      chart: kserve-crd
+      sourceRef:
+        kind: HelmRepository
+        name: ghcr.io-kserve-crd-helm-releases
+        namespace: ${workspaceNamespace}
+      version: v0.14.0-rc1
+  interval: 15s
+  install:
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    remediation:
+      retries: 30
+  releaseName: kserve-crd
+  targetNamespace: kserve
+
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: kserve
+  namespace: ${workspaceNamespace}
+spec:
+  chart:
+    spec:
+      chart: kserve
+      sourceRef:
+        kind: HelmRepository
+        name: ghcr.io-kserve-helm-releases
+        namespace: ${workspaceNamespace}
+      version: v0.14.0-rc1
+  interval: 15s
+  install:
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    remediation:
+      retries: 30
+  releaseName: kserve
+  targetNamespace: kserve
+  values:
+    kserve:
+      modelmesh:
+        enabled: false
+      controller:
+        image: quay.io/saileshd1402/kserve-controller
+        tag: v0.14.0-rc1
diff --git a/helm-repositories/kserve/kustomization.yaml b/services/nutanix-ai/1.0.0/helmrelease/kustomization.yaml
similarity index 59%
rename from helm-repositories/kserve/kustomization.yaml
rename to services/nutanix-ai/1.0.0/helmrelease/kustomization.yaml
index 9b8b4f7..1d00a92 100644
--- a/helm-repositories/kserve/kustomization.yaml
+++ b/services/nutanix-ai/1.0.0/helmrelease/kustomization.yaml
@@ -1,4 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - kserve-charts.yaml
+  - nutanix-ai.yaml
+  - istio.yaml
+  - kserve.yaml
diff --git a/services/nutanix-ai/1.0.0/nutanix-ai.yaml b/services/nutanix-ai/1.0.0/helmrelease/nutanix-ai.yaml
similarity index 75%
rename from services/nutanix-ai/1.0.0/nutanix-ai.yaml
rename to services/nutanix-ai/1.0.0/helmrelease/nutanix-ai.yaml
index f9723f3..a752f37 100644
--- a/services/nutanix-ai/1.0.0/nutanix-ai.yaml
+++ b/services/nutanix-ai/1.0.0/helmrelease/nutanix-ai.yaml
@@ -1,3 +1,15 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: nutanix.github.io-helm-releases
+  namespace: ${workspaceNamespace}
+  labels:
+    kommander.d2iq.io/dkp-airgapped: supported
+spec:
+  url: "${helmMirrorURL:=https://nutanix.github.io/helm-releases}"
+  interval: 10m
+
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
diff --git a/services/nutanix-ai/1.0.0/istio-base.yaml b/services/nutanix-ai/1.0.0/istio-base.yaml
deleted file mode 100644
index ba995e2..0000000
--- a/services/nutanix-ai/1.0.0/istio-base.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: istio-base
-  namespace: ${workspaceNamespace}
-spec:
-  chart:
-    spec:
-      chart: base
-      sourceRef:
-        kind: HelmRepository
-        name: istio-release.storage.googleapis.com-helm-releases
-        namespace: ${workspaceNamespace}
-      version: 1.23.2
-  interval: 15s
-  install:
-    remediation:
-      retries: 30
-    createNamespace: true
-  upgrade:
-    remediation:
-      retries: 30
-  releaseName: istio-base
-  targetNamespace: istio-system
diff --git a/services/nutanix-ai/1.0.0/istio-ingressgateway.yaml b/services/nutanix-ai/1.0.0/istio-ingressgateway.yaml
deleted file mode 100644
index 8c13d06..0000000
--- a/services/nutanix-ai/1.0.0/istio-ingressgateway.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: istio-ingressgateway
-  namespace: ${workspaceNamespace}
-spec:
-  chart:
-    spec:
-      chart: gateway
-      sourceRef:
-        kind: HelmRepository
-        name: istio-release.storage.googleapis.com-helm-releases
-        namespace: ${workspaceNamespace}
-      version: 1.23.2
-  interval: 15s
-  install:
-    remediation:
-      retries: 30
-    createNamespace: true
-  upgrade:
-    remediation:
-      retries: 30
-  releaseName: istio-ingressgateway
-  targetNamespace: istio-system
diff --git a/services/nutanix-ai/1.0.0/istiod.yaml b/services/nutanix-ai/1.0.0/istiod.yaml
deleted file mode 100644
index 854b33f..0000000
--- a/services/nutanix-ai/1.0.0/istiod.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: istiod
-  namespace: ${workspaceNamespace}
-spec:
-  chart:
-    spec:
-      chart: istiod
-      sourceRef:
-        kind: HelmRepository
-        name: istio-release.storage.googleapis.com-helm-releases
-        namespace: ${workspaceNamespace}
-      version: 1.23.2
-  interval: 15s
-  install:
-    remediation:
-      retries: 30
-    createNamespace: true
-  upgrade:
-    remediation:
-      retries: 30
-  releaseName: istiod
-  targetNamespace: istio-system
diff --git a/services/nutanix-ai/1.0.0/kserve-crd.yaml b/services/nutanix-ai/1.0.0/kserve-crd.yaml
deleted file mode 100644
index af34148..0000000
--- a/services/nutanix-ai/1.0.0/kserve-crd.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: kserve-crd
-  namespace: ${workspaceNamespace}
-spec:
-  chart:
-    spec:
-      chart: kserve-crd
-      sourceRef:
-        kind: HelmRepository
-        name: ghcr.io-kserve-crd-helm-releases
-        namespace: ${workspaceNamespace}
-      version: v0.14.0-rc1
-  interval: 15s
-  install:
-    remediation:
-      retries: 30
-    createNamespace: true
-  upgrade:
-    remediation:
-      retries: 30
-  releaseName: kserve-crd
-  targetNamespace: kserve
diff --git a/services/nutanix-ai/1.0.0/kserve.yaml b/services/nutanix-ai/1.0.0/kserve.yaml
deleted file mode 100644
index e7efdc0..0000000
--- a/services/nutanix-ai/1.0.0/kserve.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: kserve
-  namespace: ${workspaceNamespace}
-spec:
-  chart:
-    spec:
-      chart: kserve
-      sourceRef:
-        kind: HelmRepository
-        name: ghcr.io-kserve-helm-releases
-        namespace: ${workspaceNamespace}
-      version: v0.14.0-rc1
-  interval: 15s
-  install:
-    remediation:
-      retries: 30
-    createNamespace: true
-  upgrade:
-    remediation:
-      retries: 30
-  releaseName: kserve
-  targetNamespace: kserve
-  values:
-    kserve:
-      modelmesh:
-        enabled: false
-      controller:
-        image: quay.io/saileshd1402/kserve-controller
-        tag: v0.14.0-rc1
diff --git a/services/nutanix-ai/1.0.0/kustomization.yaml b/services/nutanix-ai/1.0.0/kustomization.yaml
deleted file mode 100644
index b5bac50..0000000
--- a/services/nutanix-ai/1.0.0/kustomization.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - nutanix-ai.yaml
-  - istio-base.yaml
-  - istiod.yaml
-  - istio-ingressgateway.yaml
-  - kserve-crd.yaml
-  - kserve.yaml
-  - ../../../helm-repositories/ntnx-charts
-  - ../../../helm-repositories/istio-charts
-  - ../../../helm-repositories/kserve-crd
-  - ../../../helm-repositories/kserve
-