diff --git a/docker-compose.yml b/docker-compose.yml
index aa9424b..ee883ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,28 +2,26 @@ services:
   # listens to mqtt packets and saves to database
   meshtastic-mqtt:
     container_name: meshtastic-mqtt
-    image: git.arinity.org/ctmesh/map:latest
+    image: git.arinity.org/ctmesh/map-mqtt:latest
     depends_on:
       database:
         condition: service_healthy
-    command: /app/docker/mqtt.sh
+    command: "--mqtt-topic=msh/US/#"
     environment:
       DATABASE_URL: "mysql://root:password@database:3306/meshtastic-map?connection_limit=100"
-      MQTT_OPTS: "--mqtt-broker-url=" # add any custom mqtt.js options here
 
   # runs the web map ui
   meshtastic-map:
     container_name: meshtastic-map
-    image: git.arinity.org/ctmesh/map:latest
+    image: git.arinity.org/ctmesh/map-web:latest
     depends_on:
       database:
         condition: service_healthy
-    command: /app/docker/map.sh
+    command: "--port=8080"
     ports:
       - 8080:8080/tcp
     environment:
       DATABASE_URL: "mysql://root:password@database:3306/meshtastic-map?connection_limit=100"
-      MAP_OPTS: "" # add any custom index.js options here
 
   # runs the database to store everything from mqtt
   database: