diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml
new file mode 100644
index 00000000..5642f9b6
--- /dev/null
+++ b/.templates/duplicati/service.yml
@@ -0,0 +1,10 @@
+  duplicati:
+    container_name: Duplicati
+    restart: unless-stopped
+    image: lsioarmhf/duplicati
+    network_mode: host
+    volumes:
+      - /:/source
+      - ./volumes/duplicati:/config
+      - /etc/localtime:/etc/localtime:ro
+ 
diff --git a/.templates/esphome/service.yml b/.templates/esphome/service.yml
new file mode 100644
index 00000000..6d39a2a5
--- /dev/null
+++ b/.templates/esphome/service.yml
@@ -0,0 +1,14 @@
+  esphome:
+    container_name: esphome
+    network_mode: host
+    restart: unless-stopped
+    environment:
+      - HOME = "/"
+    image: esphome/esphome-armv7:latest
+    ports:
+      - "6052:6052"
+      - "6123:6123"
+    volumes:
+      - ./volumes/esphome:/config:rw
+    command: config/ dashboard
+
diff --git a/.templates/hass-configurator/service.yml b/.templates/hass-configurator/service.yml
new file mode 100644
index 00000000..42565079
--- /dev/null
+++ b/.templates/hass-configurator/service.yml
@@ -0,0 +1,11 @@
+  hassconfig:
+    container_name: HASS-Configurator
+    restart: unless-stopped
+    image: marthoc/hass-configurator:latest
+    volumes:
+      - ./volumes/hassio/homeassistant:/hass-config
+      - ./volumes/hass-configurator:/config
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "3218:3218"
+
diff --git a/.templates/hass-configurator/settings.conf b/.templates/hass-configurator/settings.conf
new file mode 100644
index 00000000..f13f7e75
--- /dev/null
+++ b/.templates/hass-configurator/settings.conf
@@ -0,0 +1,17 @@
+{
+  "LISTENIP": "0.0.0.0",
+  "LISTENPORT": 3218,
+  "BASEPATH": "/hass-config",
+  "SSL_CERTIFICATE": null,
+  "SSL_KEY": null,
+  "HASS_API": "http://192.168.1.100:8123/api/",
+  "HASS_API_PASSWORD": "passwordforHASS",
+  "CREDENTIALS": "admin:password",
+  "ALLOWED_NETWORKS": [],
+  "BANNED_IPS": [],
+  "BANLIMIT": 0,
+  "IGNORE_PATTERN": [".*", "*.log", "*.db"],
+  "DIRSFIRST": true,
+  "SESAME": null,
+  "VERIFY_HOSTNAME": null
+}
diff --git a/.templates/monitor/services.yml b/.templates/monitor/services.yml
new file mode 100644
index 00000000..286f5d46
--- /dev/null
+++ b/.templates/monitor/services.yml
@@ -0,0 +1,9 @@
+  monitor:
+    container_name: Monitor
+    network_mode: host
+    privileged: true
+    restart: unless-stopped
+    image: mashupmill/presence-monitor:latest
+    volumes:
+      - ./volumes/monitor:/config
+      - /etc/localtime:/etc/localtime:ro
diff --git a/.templates/valetudomap/config.json b/.templates/valetudomap/config.json
new file mode 100644
index 00000000..ac6bd416
--- /dev/null
+++ b/.templates/valetudomap/config.json
@@ -0,0 +1,23 @@
+{
+  "mqtt": {
+    "identifier": "rockrobo",
+    "topicPrefix": "valetudo",
+    "autoconfPrefix": "homeassistant",
+    "broker_url": "mqtt://user:passwork@192.168.xxx.xxx",
+    "caPath": "",
+    "mapSettings": {
+      "drawPath": true,
+      "drawCharger": true,
+      "drawRobot": true,
+      "border": 2,
+      "scale": 4
+    },
+    "mapDataTopic": "valetudo/rockrobo/map_data",
+    "minMillisecondsBetweenMapUpdates": 10000,
+    "publishMapImage": true
+  },
+  "webserver": {
+    "enabled": false,
+    "port": 3000
+  }
+}
diff --git a/.templates/valetudomap/service.yml b/.templates/valetudomap/service.yml
new file mode 100644
index 00000000..9433e870
--- /dev/null
+++ b/.templates/valetudomap/service.yml
@@ -0,0 +1,9 @@
+  valetudomap:
+    container_name: ValetudoMap
+    restart: unless-stopped
+    image: dmkif/icantbelieveitsnotvaletudo:latest-arm
+    depends_on:
+      - "mosquitto"
+    volumes:
+      - ./volumes/valetudomap/config.json:/app/config.json
+
diff --git a/menu.sh b/menu.sh
index 6c11d62f..074f661e 100755
--- a/menu.sh
+++ b/menu.sh
@@ -406,7 +406,7 @@ case $mainmenu_selection in
 		"tinker" " " \
 		3>&1 1>&2 2>&3)
 	if [ -n "$hassio_machine" ]; then
-		curl -sL https://raw.githubusercontent.com/home-assistant/hassio-installer/master/hassio_install.sh | sudo bash -s -- -m $hassio_machine
+		curl -sL https://raw.githubusercontent.com/home-assistant/hassio-installer/master/hassio_install.sh | sudo bash -s -- -d ~/IOTstack/volumes/hassio -m $hassio_machine
 	else
 		echo "no selection"
 		exit