diff --git a/tasks/rabbitmq_cluster.yml b/tasks/rabbitmq_cluster.yml
index 7e27594..49e26ec 100644
--- a/tasks/rabbitmq_cluster.yml
+++ b/tasks/rabbitmq_cluster.yml
@@ -13,24 +13,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# The output of 'rabbitmqctl -q cluster_status' looks like this:
+# [{nodes,[{disc,[rabbit@container1,rabbit@container2,rabbit@container3]}]},
+#  {running_nodes,[rabbit@container3,rabbit@container1,rabbit@container2]},
+#  {cluster_name,<<"rabbitmq_cluster1">>},
+#  {partitions,[]},
+#  {alarms,[{rabbit@container3,[]},
+#           {rabbit@container1,[]},
+#           {rabbit@container2,[]}]}]
+#
+# Our solution to get the cluster name out cleanly is inspired by
+# https://unix.stackexchange.com/a/13472
 - name: Get rabbitmq cluster name
   shell: |
-    return_code=0
-    if ! rabbitmqctl cluster_status | grep -w '<<"{{ rabbitmq_cluster_name }}">>'; then
-      rabbitmqctl set_cluster_name {{ rabbitmq_cluster_name }}
-      return_code=2
-    fi
-    exit ${return_code}
-  when: ansible_hostname == rabbitmq_primary_cluster_node
-  register: _set_cluster_name
-  changed_when: _set_cluster_name.rc == 2
-  failed_when: _set_cluster_name.rc not in [0, 2]
-  # We skip ansible lint testing for this task as it fails with
-  # ANSIBLE0014 Environment variables don't work as part of command
-  # which is nonsense.
-  tags:
-    - skip_ansible_lint
+    rabbitmqctl -q cluster_status | grep -oP '(?<={cluster_name,<<").*(?=">>})'
+  args:
+    executable: /bin/bash
+  changed_when: false
+  register: _cluster_name
+
+- name: Set rabbitmq cluster name on primary node
+  command: |
+    rabbitmqctl set_cluster_name {{ rabbitmq_cluster_name }}
+  when:
+    - "ansible_hostname == rabbitmq_primary_cluster_node"
+    - "_cluster_name.stdout != rabbitmq_cluster_name"
 
-- include: rabbitmq_cluster_join.yml
+- name: Join cluster on secondary nodes
+  include: rabbitmq_cluster_join.yml
   static: no
-  when: ansible_hostname != rabbitmq_primary_cluster_node
+  when:
+    - "ansible_hostname != rabbitmq_primary_cluster_node"
+    - "_cluster_name.stdout != rabbitmq_cluster_name"
diff --git a/tasks/rabbitmq_cluster_join.yml b/tasks/rabbitmq_cluster_join.yml
index feb38bc..4c0caaa 100644
--- a/tasks/rabbitmq_cluster_join.yml
+++ b/tasks/rabbitmq_cluster_join.yml
@@ -13,31 +13,42 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# If cluster name is our own hostname, we assume we're not properly clustered
-# TODO(someone): implement a more robust way of checking
-# if node is clustered or not
-- block:
-    - name: Check cluster status
-      shell: |
-        rabbitmqctl -q cluster_status | grep '{cluster_name,<<"{{ rabbitmq_cluster_name }}">>}'
-      changed_when: false
+- name: Stop rabbitmq app
+  shell: |
+    rabbitmqctl stop_app
+    sleep 5
+  args:
+    executable: /bin/bash
+  tags:
+    # This task must use shell, otherwise the rabbitmqctl
+    # command somehow thinks that the sleep command is a
+    # parameter. Due to this, we skip ansible-lint checks
+    # on this task.
+    - skip_ansible_lint
 
-  rescue:
-    - name: Stop rabbitmq app
-      shell: |
-        rabbitmqctl stop_app; sleep 5
+- name: Join rabbitmq cluster
+  command: >
+    rabbitmqctl join_cluster "rabbit@{{ rabbitmq_primary_cluster_node.split('.')[0] }}"
+  register: rabbit_join_cluster
+  until: rabbit_join_cluster|success
+  retries: 5
+  delay: 2
+  tags:
+    # This task only gets executed on a condition
+    # in the rabbitmq_cluster.yml file, but ansible-lint
+    # does not seem to realise this and fails this task.
+    # Due to this, we skip ansible-lint checks on this task.
+    - skip_ansible_lint
 
-    - name: Join rabbitmq cluster
-      command: >
-        rabbitmqctl join_cluster "rabbit@{{ rabbitmq_primary_cluster_node.split('.')[0] }}"
-      register: rabbit_join_cluster
-      until: rabbit_join_cluster|success
-      retries: 5
-      delay: 2
-
-    - name: Start rabbitmq app
-      command: rabbitmqctl start_app
-      register: rabbit_start_app
-      until: rabbit_start_app|success
-      retries: 5
-      delay: 2
+- name: Start rabbitmq app
+  command: rabbitmqctl start_app
+  register: rabbit_start_app
+  until: rabbit_start_app|success
+  retries: 5
+  delay: 2
+  tags:
+    # This task only gets executed on a condition
+    # in the rabbitmq_cluster.yml file, but ansible-lint
+    # does not seem to realise this and fails this task.
+    # Due to this, we skip ansible-lint checks on this task.
+    - skip_ansible_lint