diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml
new file mode 100644
index 00000000..887e0ae5
--- /dev/null
+++ b/.templates/duplicati/service.yml
@@ -0,0 +1,16 @@
+  duplicati:
+    container_name: duplicati
+    restart: unless-stopped
+    image: linuxserver/duplicati
+    network_mode: host
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Rome
+    ports:
+      - 8200:8200
+    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/homeassistant/service.yml b/.templates/homeassistant/service.yml
new file mode 100644
index 00000000..669bdd6e
--- /dev/null
+++ b/.templates/homeassistant/service.yml
@@ -0,0 +1,9 @@
+  homeassistant:
+    container_name: home-assistant
+    image: homeassistant/raspberrypi4-homeassistant
+    volumes:
+      - ./volumes/homeassistant:/config
+    environment:
+      - TZ=Europe/Rome
+    restart: always
+    network_mode: host
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/mosquitto/service.yml b/.templates/mosquitto/service.yml
index 8a62d776..d3bc56bc 100644
--- a/.templates/mosquitto/service.yml
+++ b/.templates/mosquitto/service.yml
@@ -4,8 +4,8 @@
     restart: unless-stopped
     user: "1883"
     ports:
-      - 1883:1883
-      - 9001:9001
+      - '1883:1883'
+      - '9001:9001'
     volumes:
       - ./volumes/mosquitto/data:/mosquitto/data
       - ./volumes/mosquitto/log:/mosquitto/log
diff --git a/.templates/portainer/service.yml b/.templates/portainer/service.yml
index b7bd194a..07ad1af1 100644
--- a/.templates/portainer/service.yml
+++ b/.templates/portainer/service.yml
@@ -3,7 +3,13 @@
     image: portainer/portainer
     restart: unless-stopped
     ports:
-      - 9000:9000
+    #  - 9000:9000
+      - 9443:9000
     volumes:
+      - /etc/0_scripts:/certs
       - /var/run/docker.sock:/var/run/docker.sock
       - ./volumes/portainer/data:/data
+    command:
+      --ssl
+      --sslcert /certs/portainer.crt
+      --sslkey /certs/portainer.key
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..d030143f 100755
--- a/menu.sh
+++ b/menu.sh
@@ -8,6 +8,8 @@ declare -A cont_array=(
 	[nodered]="Node-RED"
 	[influxdb]="InfluxDB"
 	[telegraf]="Telegraf (Requires InfluxDB and Mosquitto)"
+	[duplicati]="duplicati"
+	[homeassistant]="homeassistant"
 	[grafana]="Grafana"
 	[mosquitto]="Eclipse-Mosquitto"
 	[postgres]="Postgres"
@@ -30,7 +32,7 @@ declare -A cont_array=(
 	[python]="Python 3"
 
 )
-declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "mariadb" "postgres"
+declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "duplicati" "homeassistant" "mariadb" "postgres"
 	"adminer" "openhab" "zigbee2mqtt" "pihole" "plex" "tasmoadmin" "rtl_433" "espruinohub"
 	"motioneye" "webthings_gateway" "blynk_server" "nextcloud" "diyhue" "homebridge" "python")
 
@@ -406,7 +408,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