diff --git a/Makefile b/Makefile
index 388a00c..bcf853d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 all: lint build test install
 
 .PHONY: docker-compose
-docker-compose:
+docker-compose: docker-build
 	if docker-compose version > /dev/null 2>&1; then \
 		DOCKER_COMPOSE="docker-compose"; \
 	else \
diff --git a/cmd/monitor/Dockerfile b/cmd/monitor/Dockerfile
index 0551aa7..8f6081a 100644
--- a/cmd/monitor/Dockerfile
+++ b/cmd/monitor/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:24.04
-LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
+LABEL maintainer="Canonical Sustaining Engineering <nicolas.bock@canonical.com>"
 LABEL org.opencontainers.image.description "Athena Monitor"
 
 RUN apt-get update
diff --git a/cmd/processor/Dockerfile b/cmd/processor/Dockerfile
index 5633ecf..90d80b7 100644
--- a/cmd/processor/Dockerfile
+++ b/cmd/processor/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:24.04
-LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
+LABEL maintainer="Canonical Sustaining Engineering <nicolas.bock@canonical.com>"
 LABEL org.opencontainers.image.description "Athena Processor"
 
 RUN apt-get update
diff --git a/docker-compose.yml b/docker-compose.yml
index e8a5918..ba7c5ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
 
   athena-monitor:
     container_name: athena-monitor
-    image: ghcr.io/canonical/athena-core/athena-monitor:${BRANCH:-main}
+    image: athena/athena-monitor:${BRANCH:-main}
     volumes:
       - ./creds.yaml:/etc/athena/main.yaml
       - ./athena-monitor.yaml:/etc/athena/monitor.yaml
@@ -37,7 +37,7 @@ services:
 
   athena-processor:
     container_name: athena-processor
-    image: ghcr.io/canonical/athena-core/athena-processor:${BRANCH:-main}
+    image: athena/athena-processor:${BRANCH:-main}
     volumes:
       - ./creds.yaml:/etc/athena/main.yaml
       - ./athena-processor.yaml:/etc/athena/processor.yaml