diff --git a/bundle/manifests/multicluster-gateway-controller.clusterserviceversion.yaml b/bundle/manifests/multicluster-gateway-controller.clusterserviceversion.yaml
index cd1e2bd0..95132f40 100644
--- a/bundle/manifests/multicluster-gateway-controller.clusterserviceversion.yaml
+++ b/bundle/manifests/multicluster-gateway-controller.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2023-11-03T12:02:21Z"
+    createdAt: "2023-11-06T07:47:49Z"
     operators.operatorframework.io/builder: operator-sdk-v1.28.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: multicluster-gateway-controller.v0.0.0
@@ -305,6 +305,27 @@ spec:
           - create
         serviceAccountName: mgc-controller-manager
       - rules:
+        - apiGroups:
+          - ""
+          resources:
+          - secrets
+          verbs:
+          - delete
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - cert-manager.io
+          resources:
+          - certificates
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - cert-manager.io
           resources:
@@ -327,6 +348,32 @@ spec:
           - get
           - list
           - watch
+        - apiGroups:
+          - gateway.networking.k8s.io
+          resources:
+          - gateways
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - gateway.networking.k8s.io
+          resources:
+          - gateways/finalizers
+          verbs:
+          - update
+        - apiGroups:
+          - gateway.networking.k8s.io
+          resources:
+          - gateways/status
+          verbs:
+          - get
+          - patch
+          - update
         - apiGroups:
           - kuadrant.io
           resources:
@@ -463,32 +510,33 @@ spec:
       deployments:
       - label:
           app.kubernetes.io/component: manager
-          app.kubernetes.io/created-by: policy-controller
-          app.kubernetes.io/instance: policy-controller
+          app.kubernetes.io/created-by: multicluster-gateway-controller
+          app.kubernetes.io/instance: controller-manager
           app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: deployment
           app.kubernetes.io/part-of: kuadrant
           control-plane: controller-manager
-        name: mgc-kuadrant-policy-controller-manager
+        name: mgc-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: policy-controller
+              control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: policy-controller
+                control-plane: controller-manager
             spec:
               containers:
               - args:
+                - --metrics-bind-address=0.0.0.0:8080
                 - --leader-elect
                 command:
-                - /policy_controller
-                image: quay.io/kuadrant/policy-controller:main
+                - /controller
+                image: quay.io/kuadrant/multicluster-gateway-controller:separate-controller-deploy
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -496,7 +544,10 @@ spec:
                     port: 8081
                   initialDelaySeconds: 15
                   periodSeconds: 20
-                name: policy-controller
+                name: manager
+                ports:
+                - containerPort: 8080
+                  name: metrics
                 readinessProbe:
                   httpGet:
                     path: /readyz
@@ -517,58 +568,46 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: mgc-kuadrant-policy-controller
+              serviceAccountName: mgc-controller-manager
               terminationGracePeriodSeconds: 10
       - label:
-          app.kubernetes.io/component: manager
-          app.kubernetes.io/created-by: multicluster-gateway-controller
-          app.kubernetes.io/instance: controller-manager
+          app.kubernetes.io/component: add-on-manager
+          app.kubernetes.io/created-by: kuadrant-add-on-manager
+          app.kubernetes.io/instance: kuadrant-add-on-manager
           app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: deployment
           app.kubernetes.io/part-of: kuadrant
-          control-plane: controller-manager
-        name: mgc-controller-manager
+          control-plane: kuadrant-add-on-manager
+        name: mgc-kuadrant-add-on-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: controller-manager
+              control-plane: kuadrant-add-on-manager
           strategy: {}
           template:
             metadata:
               annotations:
-                kubectl.kubernetes.io/default-container: manager
+                kubectl.kubernetes.io/default-container: controller
               labels:
-                control-plane: controller-manager
+                control-plane: kuadrant-add-on-manager
             spec:
               containers:
               - args:
-                - --metrics-bind-address=0.0.0.0:8080
                 - --leader-elect
                 command:
-                - /controller
-                image: quay.io/kuadrant/multicluster-gateway-controller:main
+                - /add-on-manager
+                envFrom:
+                - configMapRef:
+                    name: controller-config
+                    optional: true
+                image: quay.io/kuadrant/addon-manager:main
                 imagePullPolicy: Always
-                livenessProbe:
-                  httpGet:
-                    path: /healthz
-                    port: 8081
-                  initialDelaySeconds: 15
-                  periodSeconds: 20
-                name: manager
-                ports:
-                - containerPort: 8080
-                  name: metrics
-                readinessProbe:
-                  httpGet:
-                    path: /readyz
-                    port: 8081
-                  initialDelaySeconds: 5
-                  periodSeconds: 10
+                name: controller
                 resources:
                   limits:
                     cpu: 500m
-                    memory: 256Mi
+                    memory: 128Mi
                   requests:
                     cpu: 10m
                     memory: 64Mi
@@ -579,46 +618,54 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: mgc-controller-manager
+              serviceAccountName: mgc-add-on-manager
               terminationGracePeriodSeconds: 10
       - label:
-          app.kubernetes.io/component: add-on-manager
-          app.kubernetes.io/created-by: kuadrant-add-on-manager
-          app.kubernetes.io/instance: kuadrant-add-on-manager
+          app.kubernetes.io/component: manager
+          app.kubernetes.io/created-by: policy-controller
+          app.kubernetes.io/instance: policy-controller
           app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: deployment
           app.kubernetes.io/part-of: kuadrant
-          control-plane: kuadrant-add-on-manager
-        name: mgc-kuadrant-add-on-manager
+          control-plane: controller-manager
+        name: mgc-kuadrant-policy-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: kuadrant-add-on-manager
+              control-plane: policy-controller
           strategy: {}
           template:
             metadata:
               annotations:
-                kubectl.kubernetes.io/default-container: controller
+                kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: kuadrant-add-on-manager
+                control-plane: policy-controller
             spec:
               containers:
               - args:
                 - --leader-elect
                 command:
-                - /add-on-manager
-                envFrom:
-                - configMapRef:
-                    name: controller-config
-                    optional: true
-                image: quay.io/kuadrant/addon-manager:main
+                - /policy_controller
+                image: quay.io/kuadrant/policy-controller:separate-controller-deploy
                 imagePullPolicy: Always
-                name: controller
+                livenessProbe:
+                  httpGet:
+                    path: /healthz
+                    port: 8081
+                  initialDelaySeconds: 15
+                  periodSeconds: 20
+                name: policy-controller
+                readinessProbe:
+                  httpGet:
+                    path: /readyz
+                    port: 8081
+                  initialDelaySeconds: 5
+                  periodSeconds: 10
                 resources:
                   limits:
                     cpu: 500m
-                    memory: 128Mi
+                    memory: 256Mi
                   requests:
                     cpu: 10m
                     memory: 64Mi
@@ -629,7 +676,7 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: mgc-add-on-manager
+              serviceAccountName: mgc-kuadrant-policy-controller
               terminationGracePeriodSeconds: 10
       permissions:
       - rules: