diff --git a/.github/workflows/cd-pipeline.yml b/.github/workflows/cd-pipeline.yml
index 87ce72e954..5ca76f302c 100644
--- a/.github/workflows/cd-pipeline.yml
+++ b/.github/workflows/cd-pipeline.yml
@@ -64,6 +64,7 @@ on: # rebuild any PRs and main branch changes
       - 'bitnami/postgresql-ha/**'
       - 'bitnami/prestashop/**'
       - 'bitnami/pytorch/**'
+      - 'bitnami/rabbitmq-cluster-operator/**'
       - 'bitnami/rabbitmq/**'
       - 'bitnami/redis-cluster/**'
       - 'bitnami/redis/**'
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress.json b/.vib/rabbitmq-cluster-operator/cypress/cypress.json
new file mode 100644
index 0000000000..a319419591
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress.json
@@ -0,0 +1,7 @@
+{
+  "baseUrl": "http://localhost",
+  "env": {
+    "username": "test_user",
+    "password": "ComplicatedPassword123!4"
+  }
+}
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/broker-definitions.json b/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/broker-definitions.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/broker-definitions.json
@@ -0,0 +1 @@
+{}
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/exchanges.json b/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/exchanges.json
new file mode 100644
index 0000000000..dd1a6fefad
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/exchanges.json
@@ -0,0 +1,7 @@
+{
+  "newExchange": {
+    "name": "testExchange",
+    "argument1": "A",
+    "argument2": "B"
+  }
+}
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/messages.json b/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/messages.json
new file mode 100644
index 0000000000..3bbe663484
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/fixtures/messages.json
@@ -0,0 +1,5 @@
+{
+  "newMessage": {
+    "payload": "This is my first message"
+  }
+}
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/integration/rabbitmq_cluster_operator_spec.js b/.vib/rabbitmq-cluster-operator/cypress/cypress/integration/rabbitmq_cluster_operator_spec.js
new file mode 100644
index 0000000000..3c42310138
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/integration/rabbitmq_cluster_operator_spec.js
@@ -0,0 +1,33 @@
+/// <reference types="cypress" />
+import { random } from '../support/utils';
+
+it('allows uploading broker definitions', () => {
+  cy.login();
+  cy.contains('Import definitions').click();
+  cy.get('[type="file"]').selectFile(
+    'cypress/fixtures/broker-definitions.json'
+  );
+  cy.contains('input', 'Upload').click();
+  cy.get('.form-popup-warn').should('not.exist');
+  cy.contains('imported successfully');
+});
+
+it('allows publishing a message to a created exchange', () => {
+  cy.login();
+  cy.visit('/#/exchanges');
+  cy.contains('Add a new exchange').click();
+  cy.fixture('exchanges').then((exchange) => {
+    cy.get('[name="name"]').type(`${exchange.newExchange.name}${random}`);
+    cy.get('#arguments_1_mfkey').type(exchange.newExchange.argument1);
+    cy.get('#arguments_1_mfvalue').type(exchange.newExchange.argument2);
+    cy.contains('Add exchange').click({ force: true });
+    cy.reload();
+    cy.contains('a', `${exchange.newExchange.name}${random}`).click();
+  });
+  cy.contains('h2', 'Publish').click();
+  cy.fixture('messages').then((message) => {
+    cy.get('textarea').type(message.newMessage.payload);
+  });
+  cy.contains('input', 'Publish').click();
+  cy.contains('Message published');
+});
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/support/commands.js b/.vib/rabbitmq-cluster-operator/cypress/cypress/support/commands.js
new file mode 100644
index 0000000000..b1a4359069
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/support/commands.js
@@ -0,0 +1,23 @@
+const COMMAND_DELAY = 2000;
+
+for (const command of ['click']) {
+  Cypress.Commands.overwrite(command, (originalFn, ...args) => {
+    const origVal = originalFn(...args);
+
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(origVal);
+      }, COMMAND_DELAY);
+    });
+  });
+}
+
+Cypress.Commands.add(
+  'login',
+  (username = Cypress.env('username'), password = Cypress.env('password')) => {
+    cy.visit('/');
+    cy.get('[name="username"]').type(username);
+    cy.get('[name="password"]').type(password);
+    cy.contains('Login').click();
+  }
+);
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/support/index.js b/.vib/rabbitmq-cluster-operator/cypress/cypress/support/index.js
new file mode 100644
index 0000000000..37a498fb5b
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/support/index.js
@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands';
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
diff --git a/.vib/rabbitmq-cluster-operator/cypress/cypress/support/utils.js b/.vib/rabbitmq-cluster-operator/cypress/cypress/support/utils.js
new file mode 100644
index 0000000000..f0217c9773
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/cypress/cypress/support/utils.js
@@ -0,0 +1,3 @@
+/// <reference types="cypress" />
+
+export let random = (Math.random() + 1).toString(36).substring(7);
diff --git a/.vib/rabbitmq-cluster-operator/goss/goss.yaml b/.vib/rabbitmq-cluster-operator/goss/goss.yaml
new file mode 100644
index 0000000000..4148960d51
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/goss/goss.yaml
@@ -0,0 +1,21 @@
+addr:
+  tcp://ve-testing:{{ .Vars.rabbitmq.service.ports.amqp }}:
+    reachable: true
+http:
+  http://rmq-op-webhook:{{ .Vars.msgTopologyOperator.service.ports.webhook }}:
+    status: 400
+  http://ve-testing:{{ .Vars.rabbitmq.service.ports.manager }}:
+    status: 200
+file:
+  /var/run/secrets/kubernetes.io/serviceaccount:
+    exists: true
+    filetype: directory
+    mode: "3777"
+command:
+  rabbitmqctl-cluster-status:
+    exec: rabbitmqctl cluster_status
+    exit-status: 0
+    stdout:
+    {{ range $e, $i := until .Vars.rabbitmq.replicaCount }}
+      - /ve-testing-server-{{ $i }}.ve-testing-nodes/
+    {{ end }}
diff --git a/.vib/rabbitmq-cluster-operator/goss/vars.yaml b/.vib/rabbitmq-cluster-operator/goss/vars.yaml
new file mode 100644
index 0000000000..649c136bad
--- /dev/null
+++ b/.vib/rabbitmq-cluster-operator/goss/vars.yaml
@@ -0,0 +1,10 @@
+rabbitmq:
+  replicaCount: 2
+  service:
+    ports:
+      amqp: 5672
+      manager: 15672
+msgTopologyOperator:
+  service:
+    ports:
+      webhook: 443
diff --git a/.vib/rabbitmq-cluster-operator/vib-publish.json b/.vib/rabbitmq-cluster-operator/vib-publish.json
index 0e853989d9..d79630495e 100644
--- a/.vib/rabbitmq-cluster-operator/vib-publish.json
+++ b/.vib/rabbitmq-cluster-operator/vib-publish.json
@@ -22,11 +22,11 @@
           "url": "{SHA_ARCHIVE}",
           "path": "/bitnami/rabbitmq-cluster-operator"
         },
-        "runtime_parameters": "Im1zZ1RvcG9sb2d5T3BlcmF0b3IiOgogICJzZXJ2aWNlIjoKICAgICJwb3J0cyI6CiAgICAgICJ3ZWJob29rIjogNDQzCiAgICAidHlwZSI6ICJMb2FkQmFsYW5jZXIi",
+        "runtime_parameters": "ZXh0cmFEZXBsb3k6Ci0gYXBpVmVyc2lvbjogdjEKICBraW5kOiBTZWNyZXQKICBtZXRhZGF0YToKICAgIG5hbWU6IHZlLXRlc3RpbmctZGVmYXVsdC11c2VyCiAgc3RyaW5nRGF0YToKICAgIGRlZmF1bHRfdXNlci5jb25mOiB8CiAgICAgIGRlZmF1bHRfdXNlciA9IHRlc3RfdXNlcgogICAgICBkZWZhdWx0X3Bhc3MgPSBDb21wbGljYXRlZFBhc3N3b3JkMTIzITQKICAgIHBhc3N3b3JkOiBDb21wbGljYXRlZFBhc3N3b3JkMTIzITQKICAgIHVzZXJuYW1lOiB0ZXN0X3VzZXIKLSBhcGlWZXJzaW9uOiByYWJiaXRtcS5jb20vdjFiZXRhMQogIGtpbmQ6IFJhYmJpdG1xQ2x1c3RlcgogIG1ldGFkYXRhOgogICAgbmFtZTogdmUtdGVzdGluZwogIHNwZWM6CiAgICByZXBsaWNhczogMgogICAgcmVzb3VyY2VzOgogICAgICByZXF1ZXN0czoKICAgICAgICBjcHU6IDEwMG0KICAgICAgICBtZW1vcnk6IDEwME1pCi0gYXBpVmVyc2lvbjogdjEKICBraW5kOiBTZXJ2aWNlCiAgbWV0YWRhdGE6CiAgICBuYW1lOiBleHRyYS1zdmMKICBzcGVjOgogICAgdHlwZTogTG9hZEJhbGFuY2VyCiAgICBwb3J0czoKICAgICAgLSBhcHBQcm90b2NvbDogaHR0cAogICAgICAgIG5hbWU6IG1hbmFnZW1lbnQKICAgICAgICBwb3J0OiA4MAogICAgICAgIHByb3RvY29sOiBUQ1AKICAgICAgICB0YXJnZXRQb3J0OiAxNTY3MgogICAgc2VsZWN0b3I6CiAgICAgIGFwcC5rdWJlcm5ldGVzLmlvL25hbWU6IHZlLXRlc3RpbmcKbXNnVG9wb2xvZ3lPcGVyYXRvcjoKICBmdWxsbmFtZU92ZXJyaWRlOiBybXEtb3AKICBjb250YWluZXJQb3J0czoKICAgIG1ldHJpY3M6IDgwODAKICBzZXJ2aWNlOgogICAgcG9ydHM6CiAgICAgIHdlYmhvb2s6IDQ0MwogICAgdHlwZTogTG9hZEJhbGFuY2Vy",
         "target_platform": {
           "target_platform_id": "{VIB_ENV_ALTERNATIVE_TARGET_PLATFORM}",
           "size": {
-            "name": "S4"
+            "name": "M4"
           }
         }
       },
@@ -34,9 +34,35 @@
         {
           "action_id": "health-check",
           "params": {
-            "endpoint": "lb-rabbitmq-cluster-operator-rabbitmq-messaging-topology-operator-http",
+            "endpoint": "lb-rmq-op-webhook-http",
             "app_protocol": "HTTP"
           }
+        },
+        {
+          "action_id": "goss",
+          "params": {
+            "resources": {
+              "path": "/.vib/rabbitmq-cluster-operator/goss"
+            },
+            "remote": {
+              "workload": "sts-ve-testing-server"
+            },
+            "vars_file": "vars.yaml"
+          }
+        },
+        {
+          "action_id": "cypress",
+          "params": {
+            "resources": {
+              "path": "/.vib/rabbitmq-cluster-operator/cypress"
+            },
+            "endpoint": "lb-extra-svc-management",
+            "app_protocol": "HTTP",
+            "env": {
+              "username": "test_user",
+              "password": "ComplicatedPassword123!4"
+            }
+          }
         }
       ]
     },
diff --git a/.vib/rabbitmq-cluster-operator/vib-verify.json b/.vib/rabbitmq-cluster-operator/vib-verify.json
index 2d1aa48ba2..5ad174bbd9 100644
--- a/.vib/rabbitmq-cluster-operator/vib-verify.json
+++ b/.vib/rabbitmq-cluster-operator/vib-verify.json
@@ -22,11 +22,11 @@
           "url": "{SHA_ARCHIVE}",
           "path": "/bitnami/rabbitmq-cluster-operator"
         },
-        "runtime_parameters": "Im1zZ1RvcG9sb2d5T3BlcmF0b3IiOgogICJzZXJ2aWNlIjoKICAgICJwb3J0cyI6CiAgICAgICJ3ZWJob29rIjogNDQzCiAgICAidHlwZSI6ICJMb2FkQmFsYW5jZXIi",
+        "runtime_parameters": "ZXh0cmFEZXBsb3k6Ci0gYXBpVmVyc2lvbjogdjEKICBraW5kOiBTZWNyZXQKICBtZXRhZGF0YToKICAgIG5hbWU6IHZlLXRlc3RpbmctZGVmYXVsdC11c2VyCiAgc3RyaW5nRGF0YToKICAgIGRlZmF1bHRfdXNlci5jb25mOiB8CiAgICAgIGRlZmF1bHRfdXNlciA9IHRlc3RfdXNlcgogICAgICBkZWZhdWx0X3Bhc3MgPSBDb21wbGljYXRlZFBhc3N3b3JkMTIzITQKICAgIHBhc3N3b3JkOiBDb21wbGljYXRlZFBhc3N3b3JkMTIzITQKICAgIHVzZXJuYW1lOiB0ZXN0X3VzZXIKLSBhcGlWZXJzaW9uOiByYWJiaXRtcS5jb20vdjFiZXRhMQogIGtpbmQ6IFJhYmJpdG1xQ2x1c3RlcgogIG1ldGFkYXRhOgogICAgbmFtZTogdmUtdGVzdGluZwogIHNwZWM6CiAgICByZXBsaWNhczogMgogICAgcmVzb3VyY2VzOgogICAgICByZXF1ZXN0czoKICAgICAgICBjcHU6IDEwMG0KICAgICAgICBtZW1vcnk6IDEwME1pCi0gYXBpVmVyc2lvbjogdjEKICBraW5kOiBTZXJ2aWNlCiAgbWV0YWRhdGE6CiAgICBuYW1lOiBleHRyYS1zdmMKICBzcGVjOgogICAgdHlwZTogTG9hZEJhbGFuY2VyCiAgICBwb3J0czoKICAgICAgLSBhcHBQcm90b2NvbDogaHR0cAogICAgICAgIG5hbWU6IG1hbmFnZW1lbnQKICAgICAgICBwb3J0OiA4MAogICAgICAgIHByb3RvY29sOiBUQ1AKICAgICAgICB0YXJnZXRQb3J0OiAxNTY3MgogICAgc2VsZWN0b3I6CiAgICAgIGFwcC5rdWJlcm5ldGVzLmlvL25hbWU6IHZlLXRlc3RpbmcKbXNnVG9wb2xvZ3lPcGVyYXRvcjoKICBmdWxsbmFtZU92ZXJyaWRlOiBybXEtb3AKICBjb250YWluZXJQb3J0czoKICAgIG1ldHJpY3M6IDgwODAKICBzZXJ2aWNlOgogICAgcG9ydHM6CiAgICAgIHdlYmhvb2s6IDQ0MwogICAgdHlwZTogTG9hZEJhbGFuY2Vy",
         "target_platform": {
           "target_platform_id": "{VIB_ENV_ALTERNATIVE_TARGET_PLATFORM}",
           "size": {
-            "name": "S4"
+            "name": "M4"
           }
         }
       },
@@ -34,9 +34,35 @@
         {
           "action_id": "health-check",
           "params": {
-            "endpoint": "lb-rabbitmq-cluster-operator-rabbitmq-messaging-topology-operator-http",
+            "endpoint": "lb-rmq-op-webhook-http",
             "app_protocol": "HTTP"
           }
+        },
+        {
+          "action_id": "goss",
+          "params": {
+            "resources": {
+              "path": "/.vib/rabbitmq-cluster-operator/goss"
+            },
+            "remote": {
+              "workload": "sts-ve-testing-server"
+            },
+            "vars_file": "vars.yaml"
+          }
+        },
+        {
+          "action_id": "cypress",
+          "params": {
+            "resources": {
+              "path": "/.vib/rabbitmq-cluster-operator/cypress"
+            },
+            "endpoint": "lb-extra-svc-management",
+            "app_protocol": "HTTP",
+            "env": {
+              "username": "test_user",
+              "password": "ComplicatedPassword123!4"
+            }
+          }
         }
       ]
     }
diff --git a/bitnami/rabbitmq-cluster-operator/Chart.yaml b/bitnami/rabbitmq-cluster-operator/Chart.yaml
index 2a2660a783..f639b5b446 100644
--- a/bitnami/rabbitmq-cluster-operator/Chart.yaml
+++ b/bitnami/rabbitmq-cluster-operator/Chart.yaml
@@ -26,4 +26,4 @@ name: rabbitmq-cluster-operator
 sources:
   - https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq-cluster-operator
   - https://github.com/rabbitmq/cluster-operator
-version: 3.0.0
+version: 3.1.0
diff --git a/bitnami/rabbitmq-cluster-operator/templates/_helpers.tpl b/bitnami/rabbitmq-cluster-operator/templates/_helpers.tpl
index 82aa0d0361..1ba3426af3 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/_helpers.tpl
+++ b/bitnami/rabbitmq-cluster-operator/templates/_helpers.tpl
@@ -13,7 +13,7 @@ NOTE: Not using the common function to avoid generating too long names
 */}}
 {{- define "rmqco.msgTopologyOperator.fullname" -}}
 {{- if .Values.msgTopologyOperator.fullnameOverride -}}
-    {{- .Values.msgTopologyOperator.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+    {{- printf "%s" .Values.msgTopologyOperator.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else if .Values.fullnameOverride -}}
     {{- printf "%s-%s" .Values.fullnameOverride "messaging-topology-operator" | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -21,6 +21,13 @@ NOTE: Not using the common function to avoid generating too long names
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the proper RabbitMQ Messaging Topology Operator fullname adding the installation's namespace.
+*/}}
+{{- define "rmqco.msgTopologyOperator.fullname.namespace" -}}
+{{- printf "%s-%s" (include "rmqco.msgTopologyOperator.fullname" .) (include "common.names.namespace" .) | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Return the proper RabbitMQ Messaging Topology Operator fullname
 NOTE: Not using the common function to avoid generating too long names
@@ -35,6 +42,13 @@ NOTE: Not using the common function to avoid generating too long names
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the proper RabbitMQ Messaging Topology Operator fullname adding the installation's namespace.
+*/}}
+{{- define "rmqco.msgTopologyOperator.webhook.fullname.namespace" -}}
+{{- printf "%s-%s" (include "rmqco.msgTopologyOperator.webhook.fullname" .) (include "common.names.namespace" .) | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Return the proper RabbitMQ Messaging Topology Operator fullname
 */}}
diff --git a/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrole.yaml b/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrole.yaml
index 98354071ac..dae017b74f 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrole.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrole.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "rmqco.clusterOperator.fullname" . }}
+  name: {{ template "common.names.fullname.namespace" . }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
diff --git a/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrolebinding.yaml b/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrolebinding.yaml
index fc863e9170..a7310c67e8 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrolebinding.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/clusterrolebinding.yaml
@@ -8,14 +8,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "rmqco.clusterOperator.fullname" . }}
+  name: {{ template "common.names.fullname.namespace" . }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "rmqco.clusterOperator.fullname" . }}
+  name: {{ template "common.names.fullname.namespace" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "rmqco.clusterOperator.serviceAccountName" . }}
diff --git a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrole.yaml b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrole.yaml
index 9984199d4f..fe6236150e 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrole.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrole.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "rmqco.msgTopologyOperator.fullname" . }}
+  name: {{ template "rmqco.msgTopologyOperator.fullname.namespace" . }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
diff --git a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrolebinding.yaml b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrolebinding.yaml
index 9af144cc5e..c6ca709f09 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrolebinding.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/clusterrolebinding.yaml
@@ -8,14 +8,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "rmqco.msgTopologyOperator.fullname" . }}
+  name: {{ template "rmqco.msgTopologyOperator.fullname.namespace" . }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "rmqco.msgTopologyOperator.fullname" . }}
+  name: {{ template "rmqco.msgTopologyOperator.fullname.namespace" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "rmqco.msgTopologyOperator.serviceAccountName" . }}
diff --git a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/validating-webhook-configuration.yaml b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/validating-webhook-configuration.yaml
index 7c43a56e47..b48719e7e3 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/validating-webhook-configuration.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/validating-webhook-configuration.yaml
@@ -40,7 +40,7 @@ metadata:
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "rmqco.msgTopologyOperator.webhook.fullname" . }}
+  name: {{ template "rmqco.msgTopologyOperator.webhook.fullname.namespace" . }}
 webhooks:
   - admissionReviewVersions:
       - v1