diff --git a/bin/entrypoint-nextcloud.sh b/bin/entrypoint-nextcloud.sh
index 1d70532..e6e954b 100755
--- a/bin/entrypoint-nextcloud.sh
+++ b/bin/entrypoint-nextcloud.sh
@@ -18,18 +18,16 @@
 # @@sudo/root        :  no
 # @@Template         :  other/docker-entrypoint
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set bash options
+[ -n "$DEBUG" ] && set -x
+set -o pipefail
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 APPNAME="$(basename "$0" 2>/dev/null)"
 VERSION="202210042049-git"
 HOME="${USER_HOME:-$HOME}"
 USER="${SUDO_USER:-$USER}"
 RUN_USER="${SUDO_USER:-$USER}"
 SCRIPT_SRC_DIR="${BASH_SOURCE%/*}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set bash options
-[ "$1" == "--debug" ] && set -xo pipefail && export SCRIPT_OPTS="--debug" && export _DEBUG="on"
-[ "$1" == "--raw" ] && export SHOW_RAW="true"
-set -o pipefail
-
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set functions
 __version() { echo -e ${GREEN:-}"$VERSION"${NC:-}; }
diff --git a/bin/healthcheck b/bin/healthcheck
index 2827038..6bc4c17 100755
--- a/bin/healthcheck
+++ b/bin/healthcheck
@@ -1,6 +1,7 @@
 #!/bin/sh
-set -e
-
+# Set bash options
+[ -n "$DEBUG" ] && set -x
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$SIDECAR_NEWSUPDATER" = "1" ]; then
   pgrep -f "/usr/bin/nextcloud-news-updater -c /etc/news_updater.ini"
 elif [ "$SIDECAR_CRON" = "1" ] || [ "$SIDECAR_PREVIEWGEN" = "1" ]; then
diff --git a/bin/occ b/bin/occ
index 4f494df..4193abe 100755
--- a/bin/occ
+++ b/bin/occ
@@ -1,3 +1,5 @@
 #!/bin/sh
-
+# Set bash options
+[ -n "$DEBUG" ] && set -x
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 yasu nextcloud:nextcloud php -f /var/www/occ "$@"