diff --git a/apps.yml b/apps.yml
index 72ab83f97..1b25d98e7 100644
--- a/apps.yml
+++ b/apps.yml
@@ -6,9 +6,12 @@
 
     # Databases
     - { role: apps/k8s-postgres, tags: 'postgres' }
-    - { role: apps/k8s-elasticsearch, tags: 'es' }
-    - { role: apps/k8s-memcached, tags: 'es' }
-    - { role: apps/k8s-redis, tags: 'es' }
+    - { role: apps/k8s-elasticsearch, tags: 'elasticsearch' }
+    - { role: apps/k8s-memcached, tags: 'memcached' }
+    - { role: apps/k8s-redis, tags: 'redis' }
+
+    # Msg Broker
+    - { role: apps/k8s-rabbitmq, tags: 'rabbitmq' }
 
     # Monitoring
     - { role: apps/k8s-influxdb, tags: 'influxdb'}