diff --git a/example-puppet.py b/example-puppet.py
index 4f3d8c07..9356fbb2 100644
--- a/example-puppet.py
+++ b/example-puppet.py
@@ -45,7 +45,7 @@ def deploy():
     signals.connect(node1, mariadb_service1)
 
     # RABBIT
-    rabbitmq_service1 = vr.create('rabbitmq1', 'resources/rabbitmq_service', {'management_port': 15672, 'port': 5672, 'node_name': 'rabbitmq_service1'})[0]
+    rabbitmq_service1 = vr.create('rabbitmq1', 'resources/rabbitmq_service', {'management_port': 15672, 'port': 5672})[0]
     openstack_vhost = vr.create('openstack_vhost', 'resources/rabbitmq_vhost/', {'vhost_name': 'openstack'})[0]
     openstack_rabbitmq_user = vr.create('openstack_rabbitmq_user', 'resources/rabbitmq_user/', {'user_name': 'openstack', 'password': 'openstack_password'})[0]
 
diff --git a/resources/rabbitmq_service/actions/run.pp b/resources/rabbitmq_service/actions/run.pp
index 807f93bd..befa93d9 100644
--- a/resources/rabbitmq_service/actions/run.pp
+++ b/resources/rabbitmq_service/actions/run.pp
@@ -5,12 +5,8 @@ $management_port = "${resource['input']['management_port']['value']}"
 $node_name = $resource['input']['node_name']['value']
 
 class { '::rabbitmq':
-  service_manage    => false,
+  service_manage    => true,
   port              => $port,
   management_port   => $management_port,
   delete_guest_user => true,
-  environment_variables   => {
-    'RABBITMQ_NODENAME'     => $node_name,
-    'RABBITMQ_SERVICENAME'  => 'RabbitMQ'
-  }
 }
diff --git a/resources/rabbitmq_user/actions/remove.yml b/resources/rabbitmq_user/actions/remove.yml
index 7e1d80ed..b73859bc 100644
--- a/resources/rabbitmq_user/actions/remove.yml
+++ b/resources/rabbitmq_user/actions/remove.yml
@@ -4,4 +4,3 @@
     - new_rabbitmq_user: user={{user_name}}
                          vhost={{vhost_name}}
                          state=absent
-                         node={{node_name}}
diff --git a/resources/rabbitmq_user/actions/run.yml b/resources/rabbitmq_user/actions/run.yml
index 46fc5bf1..bc5c3e5c 100644
--- a/resources/rabbitmq_user/actions/run.yml
+++ b/resources/rabbitmq_user/actions/run.yml
@@ -8,4 +8,3 @@
                          read_priv=.*
                          write_priv=.*
                          state=present
-                         node={{node_name}}
diff --git a/resources/rabbitmq_user/meta.yaml b/resources/rabbitmq_user/meta.yaml
index b5be384d..d7185aa9 100644
--- a/resources/rabbitmq_user/meta.yaml
+++ b/resources/rabbitmq_user/meta.yaml
@@ -2,9 +2,6 @@ id: rabbitmq_user
 handler: ansible
 version: 1.0.0
 input:
-    node_name:
-      schema: str!
-      value:
     user_name:
       schema: str!
       value: openstack
diff --git a/resources/rabbitmq_vhost/actions/remove.yml b/resources/rabbitmq_vhost/actions/remove.yml
index 81038528..8dcefd7f 100644
--- a/resources/rabbitmq_vhost/actions/remove.yml
+++ b/resources/rabbitmq_vhost/actions/remove.yml
@@ -3,4 +3,3 @@
   tasks:
     - new_rabbitmq_vhost: name={{vhost_name}}
                           state=absent
-                          node={{node_name}}
diff --git a/resources/rabbitmq_vhost/actions/run.yml b/resources/rabbitmq_vhost/actions/run.yml
index ac45faf0..52b8bb20 100644
--- a/resources/rabbitmq_vhost/actions/run.yml
+++ b/resources/rabbitmq_vhost/actions/run.yml
@@ -2,5 +2,4 @@
   sudo: yes
   tasks:
       - new_rabbitmq_vhost: name={{vhost_name}}
-                            node={{node_name}}
                             state=present
diff --git a/resources/rabbitmq_vhost/meta.yaml b/resources/rabbitmq_vhost/meta.yaml
index 313f20a7..8291f2a6 100644
--- a/resources/rabbitmq_vhost/meta.yaml
+++ b/resources/rabbitmq_vhost/meta.yaml
@@ -2,9 +2,6 @@ id: rabbitmq_vhost
 handler: ansible
 version: 1.0.0
 input:
-    node_name:
-      schema: str!
-      value:
     vhost_name:
       schema: str!
       value: openstack