diff --git a/docker-compose.yml b/docker-compose.yml
index d290ee8..2512013 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - DATABASE_URL=sqlite:///./data/drugs.db
       - PUID=1001
       - PGID=1001
-      - MQTT_BROKER_HOST=${MQTT_BROKER_HOST:-localhost}
+      - MQTT_BROKER_HOST=${MQTT_BROKER_HOST:-mosquitto}
       - MQTT_BROKER_PORT=${MQTT_BROKER_PORT:-1883}
       - MQTT_USERNAME=${MQTT_USERNAME:-}
       - MQTT_PASSWORD=${MQTT_PASSWORD:-}
@@ -21,8 +21,6 @@ services:
       - LABEL_TEMPLATE_ID=${LABEL_TEMPLATE_ID:-vet_label}
       - LABEL_SIZE=${LABEL_SIZE:-29x90}
       - LABEL_TEST=${LABEL_TEST:-false}
-    networks:
-      - webapps
 
   mosquitto:
     image: eclipse-mosquitto:latest
@@ -34,12 +32,10 @@ services:
     environment:
       - PUID=1001
       - PGID=1001
-    networks:
-      - webapps
 
   frontend:
     image: nginx:alpine
-    container_name: drugsdev
+    container_name: drugsprod
     volumes:
       - ./frontend:/usr/share/nginx/html:ro
       - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
@@ -47,6 +43,7 @@ services:
       - backend
       - mosquitto
     networks:
+      - default
       - webapps
 
 volumes:
@@ -54,5 +51,6 @@ volumes:
   mosquitto_logs:
 
 networks:
+  default:
   webapps:
     external: true