diff --git a/resources/rabbitmq_config/meta.yaml b/resources/rabbitmq_config/meta.yaml
index fbc95887..f6f8c8d7 100644
--- a/resources/rabbitmq_config/meta.yaml
+++ b/resources/rabbitmq_config/meta.yaml
@@ -20,5 +20,3 @@ input:
     ssh_user:
       schema: str!
       value:
-
-tags: [resources/rabbitmq, resource/rabbitmq_config]
diff --git a/resources/rabbitmq_service/actions/run.yml b/resources/rabbitmq_service/actions/run.yml
index 66d36c77..9e7e845a 100644
--- a/resources/rabbitmq_service/actions/run.yml
+++ b/resources/rabbitmq_service/actions/run.yml
@@ -15,7 +15,7 @@
         - {{ management_port }}:15672
         env:
             RABBITMQ_NODENAME: {{container_name}}
-    - shell: docker exec -t {{ name }} rabbitmqctl list_users
+    - shell: docker exec -t {{ container_name }} rabbitmqctl list_users
       register: result
       until: result.rc == 0
       retries: 20
diff --git a/templates/profile.yml b/templates/profile.yml
index 7d084ae0..6e308364 100644
--- a/templates/profile.yml
+++ b/templates/profile.yml
@@ -98,15 +98,15 @@ connections:
       admin_port: keystone_port
 
   # rabbitmq
-  - for_resources: [resource/keystone_service]
-    filter_resources: [resource/keystone_vhost]
+  - for_resources: [resource/rabbitmq_service]
+    filter_resources: [resource/rabbitmq_vhost]
     mapping: {}
 
-  - for_resources: [resource/keystone_service]
-    filter_resources: [resource/keystone_user]
+  - for_resources: [resource/rabbitmq_service]
+    filter_resources: [resource/rabbitmq_user]
     mapping: {}
 
-  - for_resources: [resource/keystone_vhost]
-    filter_resources: [resource/keystone_user]
+  - for_resources: [resource/rabbitmq_vhost]
+    filter_resources: [resource/rabbitmq_user]
     mapping:
       vhost_name: vhost_name