diff --git a/Vagrantfile b/Vagrantfile
index 2bf1cf91..ba2c361d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -41,14 +41,14 @@ Vagrant.configure(2) do |config|
     bionic.vm.box = "ubuntu/bionic64"
   end
 
-  config.vm.define "opensuse423" do |leap423|
-    leap423.vm.box = "opensuse/openSUSE-42.3-x86_64"
-  end
-
   config.vm.define "opensuse150" do |leap150|
     leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
   end
 
+  config.vm.define "opensuse151" do |leap151|
+    leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
+  end
+
   config.vm.define "centos7" do |centos7|
     centos7.vm.box = "centos/7"
   end
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index 4479809e..dd6e02ed 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -67,7 +67,8 @@
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
       when:
-        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+        - (_oslomsg_rpc_vhost is undefined) or
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Apply Notify RabbitMQ vhost policies
       rabbitmq_policy:
@@ -78,21 +79,23 @@
         vhost: "{{ _oslomsg_notify_vhost }}"
       loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
       when:
-        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+        - (_oslomsg_rpc_vhost is undefined) or
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Add Notify RabbitMQ user
       rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
         password: "{{ _oslomsg_notify_password }}"
+        update_password: always
         vhost: "{{ _oslomsg_notify_vhost }}"
         configure_priv: ".*"
         read_priv: ".*"
         write_priv: ".*"
         state: "present"
-        force: true
       no_log: true
       when:
-        - _oslomsg_notify_userid != _oslomsg_rpc_userid
+        - (_oslomsg_rpc_userid is undefined) or
+          (_oslomsg_notify_userid != _oslomsg_rpc_userid)
 
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"