diff --git a/bin/tped.sh b/bin/tped.sh
index cc5c7d01..1eadbdff 100755
--- a/bin/tped.sh
+++ b/bin/tped.sh
@@ -29,7 +29,7 @@ for i in $myYMLS;
   do
     myITEMS+="$i $(echo $i | cut -d "." -f1 | tr [:lower:] [:upper:]) " 
 done
-myEDITION=$(dialog --backtitle "$myBACKTITLE" --menu "Select T-Pot Edition" 17 50 10 $myITEMS 3>&1 1>&2 2>&3 3>&-)
+myEDITION=$(dialog --backtitle "$myBACKTITLE" --menu "Select T-Pot Edition" 18 50 1 $myITEMS 3>&1 1>&2 2>&3 3>&-)
 if [ "$myEDITION" == "" ];
   then
     echo "Have a nice day!"
diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml
index 974e6b6a..53595095 100644
--- a/etc/compose/collector.yml
+++ b/etc/compose/collector.yml
@@ -163,6 +163,45 @@ services:
     volumes:
      - /data:/data
 
+## Map Redis Service
+  map_redis:
+    container_name: map_redis
+    restart: always
+    stop_signal: SIGKILL
+    tty: true
+    image: "dtagdevsec/redis:2203"
+    read_only: true
+
+## Map Web Service
+  map_web:
+    container_name: map_web
+    restart: always
+    environment:
+     - MAP_COMMAND=AttackMapServer.py
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    stop_signal: SIGKILL
+    tty: true
+    ports:
+     - "127.0.0.1:64299:64299"
+    image: "dtagdevsec/map_server:2203"
+
+## Map Data Service
+  map_data:
+    container_name: map_data
+    restart: always
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+    environment:
+     - MAP_COMMAND=DataServer_v2.py
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    stop_signal: SIGKILL
+    tty: true
+    image: "dtagdevsec/map_server:2203"
+#### /ELK
+
 # Ewsposter service
   ewsposter:
     container_name: ewsposter
diff --git a/etc/compose/hive.yml b/etc/compose/hive.yml
index d37f486b..0eab80a9 100644
--- a/etc/compose/hive.yml
+++ b/etc/compose/hive.yml
@@ -66,6 +66,45 @@ services:
     volumes:
      - /data:/data
 
+## Map Redis Service
+  map_redis:
+    container_name: map_redis
+    restart: always
+    stop_signal: SIGKILL
+    tty: true
+    image: "dtagdevsec/redis:2203"
+    read_only: true
+
+## Map Web Service
+  map_web:
+    container_name: map_web
+    restart: always
+    environment:
+     - MAP_COMMAND=AttackMapServer.py
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    stop_signal: SIGKILL
+    tty: true
+    ports:
+     - "127.0.0.1:64299:64299"
+    image: "dtagdevsec/map_server:2203"
+
+## Map Data Service
+  map_data:
+    container_name: map_data
+    restart: always
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+    environment:
+     - MAP_COMMAND=DataServer_v2.py
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    stop_signal: SIGKILL
+    tty: true
+    image: "dtagdevsec/map_server:2203"
+#### /ELK
+
 # Nginx service
   nginx:
     container_name: nginx
diff --git a/etc/compose/hive_sensor.yml b/etc/compose/hive_sensor.yml
index 5a49d7f9..680c3013 100644
--- a/etc/compose/hive_sensor.yml
+++ b/etc/compose/hive_sensor.yml
@@ -510,9 +510,6 @@ services:
     restart: always
 #    environment:
 #     - LS_JAVA_OPTS=-Xms2048m -Xmx2048m
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
     env_file:
      - /opt/tpot/etc/compose/elk_environment
     mem_limit: 2g
diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml
index e203e553..26abfc8d 100644
--- a/etc/compose/nextgen.yml
+++ b/etc/compose/nextgen.yml
@@ -478,6 +478,45 @@ services:
     volumes:
      - /data:/data
 
+## Map Redis Service
+  map_redis:
+    container_name: map_redis
+    restart: always
+    stop_signal: SIGKILL
+    tty: true
+    image: "dtagdevsec/redis:2203"
+    read_only: true
+
+## Map Web Service
+  map_web:
+    container_name: map_web
+    restart: always
+    environment:
+     - MAP_COMMAND=AttackMapServer.py
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    stop_signal: SIGKILL
+    tty: true
+    ports:
+     - "127.0.0.1:64299:64299"
+    image: "dtagdevsec/map_server:2203"
+
+## Map Data Service
+  map_data:
+    container_name: map_data
+    restart: always
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+    environment:
+     - MAP_COMMAND=DataServer_v2.py
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    stop_signal: SIGKILL
+    tty: true
+    image: "dtagdevsec/map_server:2203"
+#### /ELK
+
 # Ewsposter service
   ewsposter:
     container_name: ewsposter