diff --git a/Makefile b/Makefile
index 73c69dd..a9a0a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,11 @@ force-build:
 logs:
 	docker compose $(DOCKER_COMPOSE_ARGS) logs --follow
 
+clean:
+	docker system prune -f
+	docker volume prune -f
+
 rm:
 	docker volume rm $(shell docker volume ls --filter name=wis2-gdc -q)
 
-.PHONY: build up dev login down restart force-build logs rm
+.PHONY: build up dev login down restart force-build logs rm clean
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 2765537..fa5b1f5 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -24,9 +24,6 @@ services:
     ports:
       - 1883:1883  # default
       - 1884:1884  # websockets
-  wis2-gdc-metrics-collector:
-    ports:
-      - 8006:8006
   wis2-gdc-api:
     ports:
       - 80:80
diff --git a/wis2-gdc-broker/docker/acl.conf b/wis2-gdc-broker/docker/acl.conf
index 0901122..6778785 100644
--- a/wis2-gdc-broker/docker/acl.conf
+++ b/wis2-gdc-broker/docker/acl.conf
@@ -1,6 +1,6 @@
 user everyone
-topic read #
-topic read monitor/#
+topic read origin/a/wis2/#
+topic read monitor/a/wis2/#
 
 user _USERNAME
 topic readwrite #