diff --git a/.tests/tests/framework-cakephp.sh b/.tests/tests/framework-cakephp.sh
index d9f9d05e..3caa7340 100755
--- a/.tests/tests/framework-cakephp.sh
+++ b/.tests/tests/framework-cakephp.sh
@@ -13,12 +13,22 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=("5.2" "5.3" "5.4" "5.5" "8.0" "8.1")
+DISABLED_VERSIONS=("5.2" "5.3" "5.4" "5.5" "8.0" "8.1" "8.2")
+
+PHP_VERSION="$( get_php_version "${DVLBOX_PATH}" )"
+
+###
+### What CakePHP Version?
+###
+CAKE_PHP_VERSION=3.8
+#if [ "${PHP_VERSION}" = "8.0" ] || [ "${PHP_VERSION}" = "8.1" ]; then
+#	CAKE_PHP_VERSION=
+#fi
 
 
 echo
 echo "# --------------------------------------------------------------------------------------------------"
-echo "# [Framework] CakePHP 3.8.0"
+echo "# [Framework] CakePHP ${CAKE_PHP_VERSION}"
 echo "# --------------------------------------------------------------------------------------------------"
 echo
 
@@ -27,13 +37,13 @@ echo
 # Pre-check
 # -------------------------------------------------------------------------------------------------
 
-PHP_VERSION="$( get_php_version "${DVLBOX_PATH}" )"
 if [[ ${DISABLED_VERSIONS[*]} =~ ${PHP_VERSION} ]]; then
 	printf "[SKIP] Skipping all checks for PHP %s\\n" "${PHP_VERSION}"
 	exit 0
 fi
 
 
+
 # -------------------------------------------------------------------------------------------------
 # ENTRYPOINT
 # -------------------------------------------------------------------------------------------------
@@ -50,7 +60,7 @@ create_vhost_dir "${VHOST}"
 
 
 # Setup CakePHP project
-run "docker-compose exec --user devilbox -T php bash -c 'cd /shared/httpd/${VHOST}; composer create-project --no-interaction --prefer-dist cakephp/app cakephp 3.8'" "${RETRIES}" "${DVLBOX_PATH}"
+run "docker-compose exec --user devilbox -T php bash -c 'cd /shared/httpd/${VHOST}; composer create-project --no-interaction --prefer-dist cakephp/app cakephp ${CAKE_PHP_VERSION}'" "${RETRIES}" "${DVLBOX_PATH}"
 run "docker-compose exec --user devilbox -T php bash -c 'cd /shared/httpd/${VHOST}; ln -sf cakephp/webroot htdocs'" "${RETRIES}" "${DVLBOX_PATH}"
 run "docker-compose exec --user devilbox -T php mysql -u root -h mysql --password=\"${MYSQL_ROOT_PASSWORD}\" -e \"DROP DATABASE IF EXISTS my_cake; CREATE DATABASE my_cake;\"" "${RETRIES}" "${DVLBOX_PATH}"
 
diff --git a/.tests/tests/framework-drupal.sh b/.tests/tests/framework-drupal.sh
index ec6b2287..7d8648ef 100755
--- a/.tests/tests/framework-drupal.sh
+++ b/.tests/tests/framework-drupal.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=("5.3" "5.4" "5.5" "5.6" "8.0" "8.1")
+DISABLED_VERSIONS=("5.3" "5.4" "5.5" "5.6" "8.0" "8.1" "8.2")
 DISABLED_MYSQL_VERSIONS=("mysql-8.0" "percona-8.0")
 
 
diff --git a/.tests/tests/framework-wordpress.sh b/.tests/tests/framework-wordpress.sh
index a020f752..20ff62fb 100755
--- a/.tests/tests/framework-wordpress.sh
+++ b/.tests/tests/framework-wordpress.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=20
-DISABLED_VERSIONS=("8.0" "8.1")
+DISABLED_VERSIONS=("8.0" "8.1" "8.2")
 
 
 echo