diff --git a/config/charts/epp-standalone/templates/epp-config.yaml b/config/charts/epp-standalone/templates/epp-config.yaml
deleted file mode 100644
index c7295a5d54..0000000000
--- a/config/charts/epp-standalone/templates/epp-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.config" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-deployment.yaml b/config/charts/epp-standalone/templates/epp-deployment.yaml
deleted file mode 100644
index 4eaba71d28..0000000000
--- a/config/charts/epp-standalone/templates/epp-deployment.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.deployment" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-gke.yaml b/config/charts/epp-standalone/templates/epp-gke.yaml
deleted file mode 100644
index ee54a8469c..0000000000
--- a/config/charts/epp-standalone/templates/epp-gke.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.gke" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-leader-election-rbac.yaml b/config/charts/epp-standalone/templates/epp-leader-election-rbac.yaml
deleted file mode 100644
index 6820306788..0000000000
--- a/config/charts/epp-standalone/templates/epp-leader-election-rbac.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.lead-election-rbac" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-rbac.yaml b/config/charts/epp-standalone/templates/epp-rbac.yaml
deleted file mode 100644
index 6c99c9e56d..0000000000
--- a/config/charts/epp-standalone/templates/epp-rbac.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.rbac" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-sa-token-secret.yaml b/config/charts/epp-standalone/templates/epp-sa-token-secret.yaml
deleted file mode 100644
index ec13d9dce8..0000000000
--- a/config/charts/epp-standalone/templates/epp-sa-token-secret.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.sa-token-secret" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-service-monitor.yaml b/config/charts/epp-standalone/templates/epp-service-monitor.yaml
deleted file mode 100644
index 2e5f7a0d3e..0000000000
--- a/config/charts/epp-standalone/templates/epp-service-monitor.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.service-monitor" . -}}
diff --git a/config/charts/epp-standalone/templates/epp-service.yaml b/config/charts/epp-standalone/templates/epp-service.yaml
deleted file mode 100644
index fb6ab40573..0000000000
--- a/config/charts/epp-standalone/templates/epp-service.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.service" . -}}
diff --git a/config/charts/epp-standalone/templates/inferenceextension.yaml b/config/charts/epp-standalone/templates/inferenceextension.yaml
new file mode 100644
index 0000000000..ea5de25f83
--- /dev/null
+++ b/config/charts/epp-standalone/templates/inferenceextension.yaml
@@ -0,0 +1,8 @@
+{{- include "inference-extension.config" . -}}
+{{- include "inference-extension.deployment" . -}}
+{{- include "inference-extension.gke" . -}}
+{{- include "inference-extension.lead-election-rbac" . -}}
+{{- include "inference-extension.sa-token-secret" . -}}
+{{- include "inference-extension.service" . -}}
+{{- include "inference-extension.service-monitor" . -}}
+{{- include "inference-extension.rbac" . -}}
diff --git a/config/charts/inferencepool/templates/epp-config.yaml b/config/charts/inferencepool/templates/epp-config.yaml
deleted file mode 100644
index c7295a5d54..0000000000
--- a/config/charts/inferencepool/templates/epp-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.config" . -}}
diff --git a/config/charts/inferencepool/templates/epp-deployment.yaml b/config/charts/inferencepool/templates/epp-deployment.yaml
deleted file mode 100644
index 4eaba71d28..0000000000
--- a/config/charts/inferencepool/templates/epp-deployment.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.deployment" . -}}
diff --git a/config/charts/inferencepool/templates/epp-leader-election-rbac.yaml b/config/charts/inferencepool/templates/epp-leader-election-rbac.yaml
deleted file mode 100644
index 6820306788..0000000000
--- a/config/charts/inferencepool/templates/epp-leader-election-rbac.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.lead-election-rbac" . -}}
diff --git a/config/charts/inferencepool/templates/epp-sa-token-secret.yaml b/config/charts/inferencepool/templates/epp-sa-token-secret.yaml
deleted file mode 100644
index ec13d9dce8..0000000000
--- a/config/charts/inferencepool/templates/epp-sa-token-secret.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.sa-token-secret" . -}}
diff --git a/config/charts/inferencepool/templates/epp-service-monitor.yaml b/config/charts/inferencepool/templates/epp-service-monitor.yaml
deleted file mode 100644
index 2e5f7a0d3e..0000000000
--- a/config/charts/inferencepool/templates/epp-service-monitor.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.service-monitor" . -}}
diff --git a/config/charts/inferencepool/templates/epp-service.yaml b/config/charts/inferencepool/templates/epp-service.yaml
deleted file mode 100644
index fb6ab40573..0000000000
--- a/config/charts/inferencepool/templates/epp-service.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "inference-extension.service" . -}}
diff --git a/config/charts/inferencepool/templates/inferenceextension.yaml b/config/charts/inferencepool/templates/inferenceextension.yaml
new file mode 100644
index 0000000000..d79b5f0dcc
--- /dev/null
+++ b/config/charts/inferencepool/templates/inferenceextension.yaml
@@ -0,0 +1,6 @@
+{{- include "inference-extension.config" . -}}
+{{- include "inference-extension.deployment" . -}}
+{{- include "inference-extension.lead-election-rbac" . -}}
+{{- include "inference-extension.sa-token-secret" . -}}
+{{- include "inference-extension.service" . -}}
+{{- include "inference-extension.service-monitor" . -}}