diff --git a/.scripts/disabled_apps.sh b/.scripts/disabled_apps.sh
index 2474ec45b4..878e96595b 100644
--- a/.scripts/disabled_apps.sh
+++ b/.scripts/disabled_apps.sh
@@ -3,7 +3,13 @@ set -Eeuo pipefail
 IFS=$'\n\t'
 
 disabled_apps() {
-    grep --color=never -o -P '^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?(?=__ENABLED='"'"'?false'"'"'?)' "${COMPOSE_ENV}" | sort || true
+    local APPNAME_REGEX='^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?'
+    local FALSE_REGEX="('?false'?)"
+    local DISABLED_REGEX="__ENABLED\s*=${FALSE_REGEX}"
+    local DISABLED_APPS_REGEX="${APPNAME_REGEX}(?=${DISABLED_REGEX})"
+
+    #notice "DISABLED_APPS_REGEX [ ${DISABLED_APPS_REGEX} ]"
+    grep --color=never -o -P "${DISABLED_APPS_REGEX}" "${COMPOSE_ENV}" | sort || true
 }
 
 test_disabled_apps() {
diff --git a/.scripts/enabled_apps.sh b/.scripts/enabled_apps.sh
index 55dcdf2ac5..9697b22576 100644
--- a/.scripts/enabled_apps.sh
+++ b/.scripts/enabled_apps.sh
@@ -3,8 +3,13 @@ set -Eeuo pipefail
 IFS=$'\n\t'
 
 enabled_apps() {
-    #grep --color=never -o -P '^\s*\K([A-Z][A-Z0-9]*(__[A-Z0-9]+)?)(?=_ENABLED='"'"'?true'"'"'?$)' "${COMPOSE_ENV}"
-    grep --color=never -o -P '^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?(?=__ENABLED='"'"'?true'"'"'?)' "${COMPOSE_ENV}" | sort || true
+    local APPNAME_REGEX='^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?'
+    local TRUE_REGEX="('?true'?)"
+    local ENABLED_REGEX="__ENABLED\s*=${TRUE_REGEX}"
+    local ENABLED_APPS_REGEX="${APPNAME_REGEX}(?=${ENABLED_REGEX})"
+
+    #notice "ENABLED_APPS_REGEX [ ${ENABLED_APPS_REGEX} ]"
+    grep --color=never -o -P "${ENABLED_APPS_REGEX}" "${COMPOSE_ENV}" | sort || true
 }
 
 test_enabled_apps() {
diff --git a/.scripts/installed_apps.sh b/.scripts/installed_apps.sh
index 1f056f6895..d251af9523 100644
--- a/.scripts/installed_apps.sh
+++ b/.scripts/installed_apps.sh
@@ -3,7 +3,11 @@ set -Eeuo pipefail
 IFS=$'\n\t'
 
 installed_apps() {
-    grep --color=never -o -P '^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?(?=__ENABLED\s*=)' "${COMPOSE_ENV}" | sort || true
+    local APPNAME_REGEX='^[A-Z][A-Z0-9]*(__[A-Z0-9]+)?'
+    local INSTALLED_APPS_REGEX="${APPNAME_REGEX}(?=__ENABLED\s*=)"
+
+    #notice "INSTALLED_APPS_REGEX [ ${INSTALLED_APPS_REGEX} ]"
+    grep --color=never -o -P "${INSTALLED_APPS_REGEX}" "${COMPOSE_ENV}" | sort || true
 }
 
 test_installed_apps() {