diff --git a/homeassistant-supervised/DEBIAN/postinst b/homeassistant-supervised/DEBIAN/postinst
index 3e5ee72..11f337d 100755
--- a/homeassistant-supervised/DEBIAN/postinst
+++ b/homeassistant-supervised/DEBIAN/postinst
@@ -19,6 +19,9 @@ URL_VERSION="https://version.home-assistant.io/stable.json"
 HASSIO_VERSION=$(curl -s ${URL_VERSION} | jq -e -r '.supervisor')
 URL_APPARMOR_PROFILE="https://version.home-assistant.io/apparmor.txt"
 
+# reload systemd
+info "Reload systemd"
+systemctl daemon-reload
 
 # Restart NetworkManager
 info "Restarting NetworkManager"
diff --git a/homeassistant-supervised/DEBIAN/preinst b/homeassistant-supervised/DEBIAN/preinst
index b229df3..c36cf74 100755
--- a/homeassistant-supervised/DEBIAN/preinst
+++ b/homeassistant-supervised/DEBIAN/preinst
@@ -51,7 +51,24 @@ if [[ "$(sysctl --values kernel.dmesg_restrict)" != "0" ]]; then
     echo "kernel.dmesg_restrict=0" >> /etc/sysctl.conf
 fi
 
+# If the hassio_supervisor service is running or exists, stop it 
+if [[ "$(systemctl is-active hassio-supervisor.service)" == "active" ]]; then
+    info "Stopping hassio_supervisor service"
+    systemctl stop hassio-supervisor.service
+fi
 
+# If the hassio_apparmor service is running or exists, stop it
+if [[ "$(systemctl is-active hassio-apparmor.service)" == "active" ]]; then
+    info "Stopping hassio_apparmor service"
+    systemctl stop hassio-apparmor.service
+fi
+
+# Check for existing hassio_supervisor container and destroy it
+if [[ "$(docker ps -aq -f name=hassio_supervisor)" ]]; then
+    # ensure the hassio_supervisor service is stopped
+    info "Removing existing hassio_supervisor container"
+    docker container rm --force hassio_supervisor > /dev/null
+fi
 
 dpkg-divert --package homeassistant-supervised --add --rename \
     --divert /etc/NetworkManager/NetworkManager.conf.real /etc/NetworkManager/NetworkManager.conf