diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 766b0cb84c3498df64a7b6afc1b66539db989f12..06273bb9b131cde2a1c7dedab4abc89001461380 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -22,13 +22,13 @@
   }
 
   handle_path /generator/api/* {
-    reverse_proxy http://generator:8001
+    reverse_proxy http://data-generator:8001
   }
 
   # Route /generator to generator service with websocket support
   redir /generator /generator/
   handle /generator/* {
-    reverse_proxy http://generator:5000 {
+    reverse_proxy http://data-generator:5000 {
       # Forward necessary headers
       header_up Host {http.request.host}
       header_up X-Real-IP {http.request.remote}
diff --git a/compose.yml b/compose.yml
index 2dfe31b22adec1967dba584fae5ee931ee79f584..551d59954541bc1cd008b59d2b81d658eaf3bd0e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -96,10 +96,8 @@ services:
       - type: volume
         source: caddy_config
         target: /config
-  generator:
-    image: registry.gitlab.syncad.com/peerverity/generator/generator:${GENERATOR_TAG:-${TAG:-latest}}
-    profiles:
-      - disabled
+  data-generator:
+    image: registry.gitlab.syncad.com/peerverity/data-generator/data-generator:${GENERATOR_TAG:-${TAG:-latest}}
     environment:
       PV_DATABASE_URL: postgresql://generator@db/ratings
       UID: ${UID:-0}