diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml
index c0f8343753361dd496bc14d5856066187d1a3c43..881d19553dc84f7e02de1c3e53121eb492718f39 100644
--- a/ansible/roles/rabbitmq/tasks/bootstrap.yml
+++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml
@@ -1,19 +1,10 @@
 ---
-# TODO(SamYaple): Improve check with a custom docker module to check if alive
-- name: Checking if a rabbitmq_data exists
-  command: docker exec rabbitmq_data stat /var/lib/rabbitmq/.erlang.cookie
-  register: exists
-  changed_when: False
-  failed_when: False
-  always_run: True
-
-- name: Starting rabbitmq-data container
+- name: Creating rabbitmq volume
   kolla_docker:
-    action: "start_container"
+    action: "create_volume"
     common_options: "{{ docker_common_options }}"
-    image: "{{ rabbitmq_data_image_full }}"
-    name: "rabbitmq_data"
-    volumes: "/var/lib/rabbitmq/"
+    name: "rabbitmq"
+  register: rabbitmq_volume
 
 - name: Running RabbitMQ bootstrap container
   kolla_docker:
@@ -29,6 +20,7 @@
       BOOTSTRAP:
     name: "rabbitmq_bootstrap"
     restart_policy: "never"
-    volumes: "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
-    volumes_from: "rabbitmq_data"
-  when: exists.rc != 0
+    volumes:
+      - "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
+      - "rabbitmq:/var/lib/rabbitmq/"
+  when: rabbitmq_volume | changed
diff --git a/ansible/roles/rabbitmq/tasks/start.yml b/ansible/roles/rabbitmq/tasks/start.yml
index 59d693f3d900f29e7281f5d3bd7f9d37eded6f9e..9ed544290a6faaf2e53a3786eaf45b2c3f41f819 100644
--- a/ansible/roles/rabbitmq/tasks/start.yml
+++ b/ansible/roles/rabbitmq/tasks/start.yml
@@ -5,5 +5,6 @@
     common_options: "{{ docker_common_options }}"
     image: "{{ rabbitmq_image_full }}"
     name: "rabbitmq"
-    volumes: "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
-    volumes_from: "rabbitmq_data"
+    volumes:
+      - "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
+      - "rabbitmq:/var/lib/rabbitmq/"