diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml
index 5642f9b6b..af7575ba5 100644
--- a/.templates/duplicati/service.yml
+++ b/.templates/duplicati/service.yml
@@ -1,9 +1,17 @@
   duplicati:
     container_name: Duplicati
     restart: unless-stopped
-    image: lsioarmhf/duplicati
+    image: linuxserver/duplicati
     network_mode: host
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/London
+    #ports:
+    #  - 8200:8200
     volumes:
+      - /etc:/etc_host
+      - /home/pi/Scripts:/pi_scripts
       - /:/source
       - ./volumes/duplicati:/config
       - /etc/localtime:/etc/localtime:ro
diff --git a/.templates/homeassistant/service.yml b/.templates/homeassistant/service.yml
new file mode 100644
index 000000000..669bdd6eb
--- /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/menu.sh b/menu.sh
index 074f661ea..d030143ff 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")