diff --git a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
deleted file mode 100644
index 2f30aa4373..0000000000
--- a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-{{/*
-Copyright 2017 The Openstack-Helm Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-set -e
-
-exec rabbitmqctl status
diff --git a/rabbitmq/templates/configmap-bin.yaml b/rabbitmq/templates/configmap-bin.yaml
index d2cd023d1f..69eef0c1f7 100644
--- a/rabbitmq/templates/configmap-bin.yaml
+++ b/rabbitmq/templates/configmap-bin.yaml
@@ -30,8 +30,6 @@ data:
 {{ tuple "bin/_rabbitmq-test.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   rabbitmq-liveness.sh: |
 {{ tuple "bin/_rabbitmq-liveness.sh.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
-  rabbitmq-readiness.sh: |
-{{ tuple "bin/_rabbitmq-readiness.sh.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
   rabbitmq-start.sh: |
 {{ tuple "bin/_rabbitmq-start.sh.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
 {{ end }}
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index bbd35cc67f..28cafc318d 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -136,9 +136,8 @@ spec:
           readinessProbe:
             initialDelaySeconds: 10
             timeoutSeconds: 10
-            exec:
-              command:
-              - /tmp/rabbitmq-readiness.sh
+            tcpSocket:
+              port: {{ tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
             initialDelaySeconds: 30
             timeoutSeconds: 10
diff --git a/tools/deployment/openstack-support/030-rabbitmq.sh b/tools/deployment/openstack-support/030-rabbitmq.sh
index 6d8df210d0..f6fe6c9abc 100755
--- a/tools/deployment/openstack-support/030-rabbitmq.sh
+++ b/tools/deployment/openstack-support/030-rabbitmq.sh
@@ -23,7 +23,7 @@ make rabbitmq
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install rabbitmq ./rabbitmq \
     --namespace=openstack \
-    --set pod.replicas.server=1 \
+    --set pod.replicas.server=3 \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}