diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml
index 2dafa300c..e0e82a68f 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml
@@ -4,7 +4,6 @@ init_dest_dir: /lib/systemd/system/
 init_ext: .service
 required_packages:
   - mysql-server
-  - rabbitmq-server
   - python-dev
   - python-mysqldb
   - python-configparser
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/main.yml b/playbooks/roles/bifrost-ironic-install/tasks/main.yml
index 72ee4199e..3697ab3b3 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/main.yml
@@ -54,7 +54,7 @@
 - name: "Install RabbitMQ if required"
   import_role:
     name: bifrost-rabbitmq
-  when: use_rabbitmq
+  when: use_rabbitmq | bool
 
 - name: "Install Ironic deps"
   include: install.yml
diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml
index 7ae226438..c758fcb79 100644
--- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml
+++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml
@@ -4,7 +4,6 @@ init_dest_dir: /lib/systemd/system/
 init_ext: .service
 required_packages:
   - mysql-server
-  - rabbitmq-server
   - python-dev
   - python-mysqldb
   - python-configparser
diff --git a/playbooks/roles/bifrost-rabbitmq/tasks/main.yml b/playbooks/roles/bifrost-rabbitmq/tasks/main.yml
index 744238940..3f5574069 100644
--- a/playbooks/roles/bifrost-rabbitmq/tasks/main.yml
+++ b/playbooks/roles/bifrost-rabbitmq/tasks/main.yml
@@ -15,7 +15,7 @@
   package:
     name: "{{ rabbitmq_package }}"
     state: present
-  when: skip_package_install | bool != True
+  when: not skip_package_install | bool
 
 # NOTE(hwoarang): The erlang SUSE package forces epmd to listen on localhost
 # address which breaks rabbitmq-server when listening on a different address.
@@ -37,12 +37,16 @@
       with_items:
         - epmd.socket
         - epmd
-  when: ansible_os_family == 'Suse'
+  when:
+    - ansible_os_family == 'Suse'
+    - not skip_bootstrap | bool
 
 - import_tasks: start.yml
+  when: not skip_start | bool
 
 - name: "Ensure guest user is removed from rabbitmq"
   rabbitmq_user:
     user: "guest"
     state: absent
     force: yes
+  when: not skip_bootstrap | bool