diff --git a/QPKG/package_routines b/QPKG/package_routines
index cd84a8d..2e646c4 100755
--- a/QPKG/package_routines
+++ b/QPKG/package_routines
@@ -108,14 +108,9 @@ QPKG_NAME="RoonServer"
 
 #PKG_PRE_REMOVE="{
 #}"
-
-PKG_MAIN_REMOVE="{
-
-    ## Remove Roon Servers docker image 
-    CS_DIR=`$CMD_GETCFG "container-station" Install_Path -f "${SYS_QPKG_CONFIG_FILE}"`
-    $CS_DIR/bin/system-docker image rm 'ghcr.io/roonlabs/roonserver:latest'
-
-}"
+#
+#PKG_MAIN_REMOVE="{
+#}"
 
 PKG_POST_REMOVE="{
     ## Remove symlink of web interface, if it still exist
diff --git a/QPKG/shared/RoonServer.sh b/QPKG/shared/RoonServer.sh
index 4cbf516..1a7938d 100755
--- a/QPKG/shared/RoonServer.sh
+++ b/QPKG/shared/RoonServer.sh
@@ -205,7 +205,7 @@ case "$1" in
         echolog "Stopping RoonServer..."
         compose_docker_yml_files
         export_vars
-        ${DOCKER_CMD} compose ${COMPOSE_FILES} down
+        ${DOCKER_CMD} compose ${COMPOSE_FILES} down --remove-orphans
         [ -d "${WEB_PATH}${WEBUI}" ] && rm  "${WEB_PATH}${WEBUI}"
         echolog "RoonServer has been stopped."
       fi