diff --git a/docker-compose.yml b/docker-compose.yml
index 44fb37f..51d222d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   mongodb:
-    container_name: mongodb-${teamname:-defaultASW}
+    container_name: mongodb-${teamname:-wiq_0}
     image: mongo
     profiles: ["dev", "prod"]
     volumes:
@@ -12,8 +12,8 @@ services:
       - mynetwork
 
   authservice:
-    container_name: authservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/authservice:latest
+    container_name: authservice-${teamname:-wiq_0}
+    image: ghcr.io/arquisoft/${teamname:-wiq_0}/authservice:latest
     profiles: ["dev", "prod"]
     build: ./users/authservice
     depends_on:
@@ -26,8 +26,8 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/userdb
       
   userservice:
-    container_name: userservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/userservice:latest
+    container_name: userservice-${teamname:-wiq_0}
+    image: ghcr.io/arquisoft/${teamname:-wiq_0}/userservice:latest
     profiles: ["dev", "prod"]
     build: ./users/userservice
     depends_on:
@@ -40,8 +40,8 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
   gatewayservice:
-    container_name: gatewayservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/gatewayservice:latest
+    container_name: gatewayservice-${teamname:-wiq_0}
+    image: ghcr.io/arquisoft/${teamname:-wiq_0}/gatewayservice:latest
     profiles: ["dev", "prod"]
     build: ./gatewayservice
     depends_on:
@@ -58,7 +58,7 @@ services:
       USER_SERVICE_URL: http://userservice:8001
 
   questionservice:
-    container_name: questionservice-${teamname:-defaultASW}
+    container_name: questionservice-${teamname:-wiq_0}
     build: ./questionservice
     ports:
       - "8003:8003"
@@ -66,8 +66,8 @@ services:
       - mynetwork
       
   webapp:
-    container_name: webapp-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/webapp:latest
+    container_name: webapp-${teamname:-wiq_0}
+    image: ghcr.io/arquisoft/${teamname:-wiq_0}/webapp:latest
     profiles: ["dev", "prod"]
     build: ./webapp
     depends_on:
@@ -77,7 +77,7 @@ services:
 
   prometheus:
     image: prom/prometheus
-    container_name: prometheus-${teamname:-defaultASW}
+    container_name: prometheus-${teamname:-wiq_0}
     profiles: ["dev"]
     networks:
       - mynetwork
@@ -91,7 +91,7 @@ services:
       
   grafana:
     image: grafana/grafana
-    container_name: grafana-${teamname:-defaultASW}
+    container_name: grafana-${teamname:-wiq_0}
     profiles: ["dev"]
     networks:
       - mynetwork