diff --git a/infrastructure/istio/helmfile.d/00-namespaces.yaml b/infrastructure/istio/helmfile.d/00-namespaces.yaml
index 22eb3997..d5bb54ce 100644
--- a/infrastructure/istio/helmfile.d/00-namespaces.yaml
+++ b/infrastructure/istio/helmfile.d/00-namespaces.yaml
@@ -1,6 +1,5 @@
-environments:
-  default:
-  cni:
+bases:
+  - environments.yaml
 
 repositories:
   - name: incubator
diff --git a/infrastructure/istio/helmfile.d/05-istio-base.yaml b/infrastructure/istio/helmfile.d/05-istio-base.yaml
index 75a3ec44..d7b6d740 100644
--- a/infrastructure/istio/helmfile.d/05-istio-base.yaml
+++ b/infrastructure/istio/helmfile.d/05-istio-base.yaml
@@ -1,6 +1,5 @@
-environments:
-  default:
-  cni:
+bases:
+  - environments.yaml
 
 repositories:
   - name: istio
diff --git a/infrastructure/istio/helmfile.d/06-istio-cni.yaml b/infrastructure/istio/helmfile.d/06-istio-cni.yaml
index d6c572ab..eb9377de 100644
--- a/infrastructure/istio/helmfile.d/06-istio-cni.yaml
+++ b/infrastructure/istio/helmfile.d/06-istio-cni.yaml
@@ -1,6 +1,5 @@
-environments:
-  default:
-  cni:
+bases:
+  - environments.yaml
 
 repositories:
   - name: istio
diff --git a/infrastructure/istio/helmfile.d/10-istiod.yaml b/infrastructure/istio/helmfile.d/10-istiod.yaml
index 13688d5f..46ddeb27 100644
--- a/infrastructure/istio/helmfile.d/10-istiod.yaml
+++ b/infrastructure/istio/helmfile.d/10-istiod.yaml
@@ -1,6 +1,5 @@
-environments:
-  default:
-  cni:
+bases:
+  - environments.yaml
 
 repositories:
   - name: istio
diff --git a/infrastructure/istio/helmfile.d/11-istio-ingress.yaml b/infrastructure/istio/helmfile.d/11-istio-ingress.yaml
index 221b5af2..61adb5d8 100644
--- a/infrastructure/istio/helmfile.d/11-istio-ingress.yaml
+++ b/infrastructure/istio/helmfile.d/11-istio-ingress.yaml
@@ -1,6 +1,5 @@
-environments:
-  default:
-  cni:
+bases:
+  - environments.yaml
 
 repositories:
   - name: istio
diff --git a/infrastructure/istio/helmfile.d/20-addons.yaml b/infrastructure/istio/helmfile.d/20-addons.yaml
index 2c849279..257ac022 100644
--- a/infrastructure/istio/helmfile.d/20-addons.yaml
+++ b/infrastructure/istio/helmfile.d/20-addons.yaml
@@ -1,6 +1,5 @@
-environments:
-  default:
-  cni:
+bases:
+  - environments.yaml
 
 repositories:
   - name: prometheus-community
diff --git a/infrastructure/istio/helmfile.d/environments.yaml b/infrastructure/istio/helmfile.d/environments.yaml
new file mode 100644
index 00000000..00e39187
--- /dev/null
+++ b/infrastructure/istio/helmfile.d/environments.yaml
@@ -0,0 +1,3 @@
+environments:
+  default:
+  cni: