diff --git a/infrastructure/istio-gateway/vad/istio-gateway.yaml b/infrastructure/istio-gateway/vad/istio-gateway.yaml
new file mode 100644
index 0000000..bd1020d
--- /dev/null
+++ b/infrastructure/istio-gateway/vad/istio-gateway.yaml
@@ -0,0 +1,17 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: ingressgateway
+  namespace: istio-system
+spec:
+  interval: 5m
+  timeout: 10m
+  dependsOn:
+    - name: istio-base
+      namespace: istio-system
+    - name: istiod
+      namespace: istio-system
+  values:
+    global:
+      imagePullSecrets:
+        - regcred
diff --git a/infrastructure/istio-gateway/vad/kustomization.yaml b/infrastructure/istio-gateway/vad/kustomization.yaml
index 27bb5cb..ecc3c36 100644
--- a/infrastructure/istio-gateway/vad/kustomization.yaml
+++ b/infrastructure/istio-gateway/vad/kustomization.yaml
@@ -2,3 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: istio-gateway.yaml
diff --git a/infrastructure/istio-pilot/vad/istio-pilot.yaml b/infrastructure/istio-pilot/vad/istio-pilot.yaml
new file mode 100644
index 0000000..a7d0773
--- /dev/null
+++ b/infrastructure/istio-pilot/vad/istio-pilot.yaml
@@ -0,0 +1,15 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: istiod
+  namespace: istio-system
+spec:
+  interval: 5m
+  timeout: 10m
+  dependsOn:
+    - name: istio-base
+      namespace: istio-system
+  values:
+    global:
+      imagePullSecrets:
+        - regcred
diff --git a/infrastructure/istio-pilot/vad/kustomization.yaml b/infrastructure/istio-pilot/vad/kustomization.yaml
index 27bb5cb..252e659 100644
--- a/infrastructure/istio-pilot/vad/kustomization.yaml
+++ b/infrastructure/istio-pilot/vad/kustomization.yaml
@@ -2,3 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: istio-pilot.yaml
diff --git a/infrastructure/rabbitmq/vad/rabbitmq.yaml b/infrastructure/rabbitmq/vad/rabbitmq.yaml
index 194d7ec..498bbef 100644
--- a/infrastructure/rabbitmq/vad/rabbitmq.yaml
+++ b/infrastructure/rabbitmq/vad/rabbitmq.yaml
@@ -22,6 +22,45 @@ spec:
               - op: add
                 path: /spec/template/spec/tolerations
                 value: []
+          - target:
+              group: cert-manager.io
+              version: v1
+              kind: Certificate
+              namespace: gateway
+              name: rmq-tls
+            patch: |-
+              $patch: delete
+              apiVersion: cert-manager.io/v1
+              kind: Certificate
+              metadata:
+                name: rmq-tls
+                namespace: gateway
+          - target:
+              group: networking.istio.io
+              version: v1beta1
+              kind: Gateway
+              namespace: gateway
+              name: rmq-gateway
+            patch: |-
+              $patch: delete
+              apiVersion: networking.istio.io/v1beta1
+              kind: Gateway
+              metadata:
+                name: rmq-gateway
+                namespace: gateway
+          - target:
+              group: networking.istio.io
+              version: v1
+              kind: VirtualService
+              namespace: rabbitmq
+              name: rmq-virt-service
+            patch: |-
+              $patch: delete
+              apiVersion: networking.istio.io/v1
+              kind: VirtualService
+              metadata:
+                name: rmq-virt-service
+                namespace: rabbitmq
   values:
     global:
       security: