diff --git a/instance/istio-system/gateway.yaml b/instance/istio-system/gateway.yaml
index cbfd08eeaffbda3631285c836a4c7b5526005cc9..e68eba999f16d50fd71c154f5a4e80a9606e3d4c 100644
--- a/instance/istio-system/gateway.yaml
+++ b/instance/istio-system/gateway.yaml
@@ -8,19 +8,19 @@ spec:
     istio: ingressgateway
   servers:
   - port:
-      number: 80
       name: http
       protocol: HTTP
+      number: 80
     hosts:
     - '*'
     # tls:
     #   httpsRedirect: true
   - port:
-      number: 443
       name: https
       protocol: HTTPS
+      number: 443
     hosts:
     - '*.hostname' # {"$kpt-set":"gateway-hostname"}
     tls:
-      mode: SIMPLE
       credentialName: wildcard-cert # {"$kpt-set":"gateway-tls-secret"}
+      mode: SIMPLE
diff --git a/instance/istio-system/kustomization.yaml b/instance/istio-system/kustomization.yaml
index 852ede0f98448d1f38d3719fa73b05f8debbc80d..dd4817046e1571fe5eccd5c25493e62ab37ff304 100644
--- a/instance/istio-system/kustomization.yaml
+++ b/instance/istio-system/kustomization.yaml
@@ -1,6 +1,4 @@
 namespace: istio-system
-
 resources:
 - ../../base/istio/istio-system
-
 - gateway.yaml
diff --git a/instance/logging/ingress/kibana-vs.yaml b/instance/logging/ingress/kibana-vs.yaml
index 0cc0b0f50d207dbc2b35dd730785e48f0b820dab..8db2370581daa143ed7212f0ed40bd84aff39e8f 100644
--- a/instance/logging/ingress/kibana-vs.yaml
+++ b/instance/logging/ingress/kibana-vs.yaml
@@ -3,10 +3,10 @@ kind: VirtualService
 metadata:
   name: kibana
 spec:
-  hosts:
-  - "kibana.hostname" # {"$kpt-set":"kibana-hostname"}
   gateways:
   - main.istio-system.svc.cluster.local
+  hosts:
+  - "kibana.hostname" # {"$kpt-set":"kibana-hostname"}
   http:
   - route:
     - destination:
diff --git a/instance/logging/kustomization.yaml b/instance/logging/kustomization.yaml
index 73fdf28edd5beef7b93e9c4906fcf3109f4f18fb..08186a0552a519bdf22b1af9b3b35a2b94e5bd44 100644
--- a/instance/logging/kustomization.yaml
+++ b/instance/logging/kustomization.yaml
@@ -1,6 +1,4 @@
 namespace: logging
-
 resources:
 - ../../base/logging/efk
-
 - ingress
diff --git a/instance/monitoring/helmrelease.yaml b/instance/monitoring/helmrelease.yaml
index d58d4f4da8be8cb296059aee950a900e01de8efe..52bd55abfa1d1b4c0c42580051b249de533fe226 100644
--- a/instance/monitoring/helmrelease.yaml
+++ b/instance/monitoring/helmrelease.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
diff --git a/instance/monitoring/ingress/alertmanager-vs.yaml b/instance/monitoring/ingress/alertmanager-vs.yaml
index c27cae17e46578f1bf1bc96b59b182c0e52b72c8..66195b9f990feb266b4c7ca511ac3e190d840e4e 100644
--- a/instance/monitoring/ingress/alertmanager-vs.yaml
+++ b/instance/monitoring/ingress/alertmanager-vs.yaml
@@ -3,10 +3,10 @@ kind: VirtualService
 metadata:
   name: alert-manager
 spec:
-  hosts:
-  - "alerts.hostname" # {"$kpt-set":"alertmanager-hostname"}
   gateways:
   - main.istio-system.svc.cluster.local
+  hosts:
+  - "alerts.hostname" # {"$kpt-set":"alertmanager-hostname"}
   http:
   - route:
     - destination:
diff --git a/instance/monitoring/ingress/grafana-vs.yaml b/instance/monitoring/ingress/grafana-vs.yaml
index bbb8f8965e75840d30b8caa03fb4565ccff89257..ed3bd22154c90ffaac186291799c62a4bad7b1b2 100644
--- a/instance/monitoring/ingress/grafana-vs.yaml
+++ b/instance/monitoring/ingress/grafana-vs.yaml
@@ -3,10 +3,10 @@ kind: VirtualService
 metadata:
   name: grafana
 spec:
-  hosts:
-  - "grafana.hostname" # {"$kpt-set":"grafana-hostname"}
   gateways:
   - main.istio-system.svc.cluster.local
+  hosts:
+  - "grafana.hostname" # {"$kpt-set":"grafana-hostname"}
   http:
   - route:
     - destination:
diff --git a/instance/monitoring/ingress/kustomization.yaml b/instance/monitoring/ingress/kustomization.yaml
index b48335caebeb16947509c55869248e273f0089b5..d87344a885861952ec05cb59f7d4d8cbbbfdc4eb 100644
--- a/instance/monitoring/ingress/kustomization.yaml
+++ b/instance/monitoring/ingress/kustomization.yaml
@@ -1,5 +1,4 @@
 namespace: monitoring
-
 resources:
 - alertmanager-vs.yaml
 - grafana-vs.yaml
diff --git a/instance/monitoring/ingress/prometheus-vs.yaml b/instance/monitoring/ingress/prometheus-vs.yaml
index 763b2ba2c464c02a9955344d283a26ce840b2f8d..20bd8ba97c7aeda6992ad78d11dda7e0adc388c4 100644
--- a/instance/monitoring/ingress/prometheus-vs.yaml
+++ b/instance/monitoring/ingress/prometheus-vs.yaml
@@ -3,10 +3,10 @@ kind: VirtualService
 metadata:
   name: prometheus
 spec:
-  hosts:
-  - "prometheus.hostname" # {"$kpt-set":"prometheus-hostname"}
   gateways:
   - main.istio-system.svc.cluster.local
+  hosts:
+  - "prometheus.hostname" # {"$kpt-set":"prometheus-hostname"}
   http:
   - route:
     - destination:
diff --git a/instance/monitoring/kustomization.yaml b/instance/monitoring/kustomization.yaml
index a292718b71c60e620e4fc262baaec5b10287e3fa..412263915639cfabe7be9e7e76b2042618356eff 100644
--- a/instance/monitoring/kustomization.yaml
+++ b/instance/monitoring/kustomization.yaml
@@ -1,10 +1,7 @@
 namespace: monitoring
-
 resources:
 - ../../base/monitoring
-
 # Environment specific values
 - ingress
-
 patchesStrategicMerge:
-  - helmrelease.yaml
\ No newline at end of file
+- helmrelease.yaml