diff --git a/README.md b/README.md
index 33017ee..56c2c3f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
 <h2 align="center">
     <a href="https://httpie.io" target="blank_">
         <img height="100" alt="nullplatform" src="https://nullplatform.com/favicon/android-chrome-192x192.png" />
diff --git a/charts/agent/templates/configmap.yaml b/charts/agent/templates/configmap.yaml
index 5a75a87..f2095c2 100644
--- a/charts/agent/templates/configmap.yaml
+++ b/charts/agent/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.initScripts }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/charts/base/templates/gateways.yaml b/charts/base/templates/gateways.yaml
index b10de66..2cfb9f4 100644
--- a/charts/base/templates/gateways.yaml
+++ b/charts/base/templates/gateways.yaml
@@ -58,7 +58,45 @@ spec:
       namespaces:
         from: All
   {{- end }}
+
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Values.gateway.internal.name }}
+  namespace: {{ .Values.namespaces.gateway }}
+spec:
+  # Match the generated Deployment by reference
+  # Note: Do not use `kind: Gateway`.
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Values.gateway.internal.name }}-istio
+    namespace: {{ .Values.namespaces.gateway }}
+  minReplicas: {{ .Values.gateway.internal.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.gateway.internal.autoscaling.maxReplicas }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 50
 ---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ .Values.gateway.internal.name }}
+  namespace: {{ .Values.namespaces.gateway }}
+
+spec:
+  minAvailable: 1
+  selector:
+    # Match the generated Deployment by label
+    matchLabels:
+      istio.io/gateway-name: {{ .Values.gateway.internal.name }}
+---
+{{- end }}
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
@@ -135,42 +173,5 @@ spec:
     matchLabels:
       istio.io/gateway-name: {{ .Values.gateway.public.name }}
 ---
-{{- if .Values.gateway.internal.enabled }}
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ .Values.gateway.internal.name }}
-  namespace: {{ .Values.namespaces.gateway }}
-spec:
-  # Match the generated Deployment by reference
-  # Note: Do not use `kind: Gateway`.
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ .Values.gateway.internal.name }}-istio
-    namespace: {{ .Values.namespaces.gateway }}
-  minReplicas: {{ .Values.gateway.internal.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.gateway.internal.autoscaling.maxReplicas }}
-  metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      target:
-        type: Utilization
-        averageUtilization: 50
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: {{ .Values.gateway.internal.name }}
-  namespace: {{ .Values.namespaces.gateway }}
-
-spec:
-  minAvailable: 1
-  selector:
-    # Match the generated Deployment by label
-    matchLabels:
-      istio.io/gateway-name: {{ .Values.gateway.internal.name }}
-{{- end }}
-{{- end }}
 {{- end }}
+