diff --git a/compose.yaml b/compose.yaml
index 0c1dd8bc3103107eeb5b702ccdf6df2d65befbac..e70e897a593e4ee8cf3aa3a1b0f468c2c27827a0 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -3,6 +3,7 @@ services:
     build:
       context: .
       target: pa165-formula-team-management-application
+    container_name: application
     ports:
       - "8081:8081"
     environment:
@@ -12,6 +13,7 @@ services:
     build:
       context: .
       target: pa165-formula-team-management-core
+    container_name: core
     ports:
       - "8090:8090"
     environment:
@@ -21,6 +23,7 @@ services:
     build:
       context: .
       target: pa165-formula-team-management-notification
+    container_name: notification
     ports:
       - "8083:8083"
 
@@ -28,6 +31,7 @@ services:
     build:
       context: .
       target: pa165-formula-team-management-visualization
+    container_name: visualization
     volumes:
       - ./visualization/output-data:/output-data
     ports:
diff --git a/prometheus.yml b/prometheus.yml
index 58b2dcfe48071401edce53f51364a9f3269b8361..aedec200866b8ec2b054c2af419d09ed99560d84 100644
--- a/prometheus.yml
+++ b/prometheus.yml
@@ -11,7 +11,7 @@ scrape_configs:
     metrics_path: /actuator/prometheus
     static_configs:
       - targets:
-        - host.docker.internal:8090
-        - host.docker.internal:8081
-        - host.docker.internal:8082
-        - host.docker.internal:8083
\ No newline at end of file
+        - core:8090
+        - application:8081
+        - visualization:8082
+        - notification:8083
\ No newline at end of file