diff --git a/.envrc.dist b/.envrc.dist
index 370fc62..9b13551 100644
--- a/.envrc.dist
+++ b/.envrc.dist
@@ -1,2 +1,5 @@
 export PATH=$PWD/laradockctl/bin:$PATH
-export LARADOCKCTL_COMMAND_PATH=$PWD/.laradock/commands:$PWD/laradockctl/src/commands
+export LARADOCKCTL_ADDITIONAL_COMMAND_DIRS=$PWD/.laradock/commands
+export LARADOCKCTL_CONTAINER_NAMES=workspace
+export LARADOCKCTL_ENV_FILE=$PWD/.laradock/env-development
+export LARADOCKCTL_PHIVE_HOME_DIR_CONTAINER=.laradock/data/phive
diff --git a/.gitignore b/.gitignore
index e5e1024..2b3d81c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,7 @@
 .php_cs.cache
 .phpunit.result.cache
 phpcs.xml
+phpdoc.xml
 phpstan.neon
 phpunit.xml
+psalm.xml
diff --git a/.gitmodules b/.gitmodules
index 9534116..9274920 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
-[submodule "laradockctl"]
-	path = laradockctl
-	url = https://github.com/ngmy/laradockctl.git
 [submodule "laradock"]
 	path = laradock
 	url = https://github.com/Laradock/laradock.git
+	ignore = dirty
+[submodule "laradockctl"]
+	path = laradockctl
+	url = https://github.com/ngmy/laradockctl.git
diff --git a/.laradock/commands/.gitkeep b/.laradock/commands/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.laradock/commands/my/destroy.sh b/.laradock/commands/my/destroy.sh
deleted file mode 100644
index 8bc0d23..0000000
--- a/.laradock/commands/my/destroy.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -Ceuo pipefail
-
-local NAME='my:destroy'
-local DESCRIPTION='Destory my development environment'
-
-handle() {
-  docker-compose down -v
-  local YN
-  read -p 'Do you want to remove data? (y/N)' YN
-  if [[ "${YN}" == 'y' ]]; then
-    sudo rm -rf ../.laradock/data/*
-  fi
-}
diff --git a/.laradock/commands/my/down.sh b/.laradock/commands/my/down.sh
deleted file mode 100644
index 125d2c5..0000000
--- a/.laradock/commands/my/down.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -Ceuo pipefail
-
-local NAME='my:down'
-local DESCRIPTION='Shut down my development environment'
-
-handle() {
-  docker-compose stop
-}
diff --git a/.laradock/commands/my/phive.sh b/.laradock/commands/my/phive.sh
deleted file mode 100644
index 128ec0b..0000000
--- a/.laradock/commands/my/phive.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -Ceuo pipefail
-
-local NAME='my:phive'
-local DESCRIPTION='Execute a PHIVE command'
-
-handle() {
-  docker-compose exec -u laradock workspace phive --home .laradock/data/phive "$@"
-}
diff --git a/.laradock/commands/my/up.sh b/.laradock/commands/my/up.sh
deleted file mode 100644
index e91e585..0000000
--- a/.laradock/commands/my/up.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -Ceuo pipefail
-
-local NAME='my:up'
-local DESCRIPTION='Start up my development environment'
-
-handle() {
-  cp -f ../.laradock/env-development .env
-  docker-compose up -d --build workspace
-  docker-compose exec -u laradock workspace composer install
-  docker-compose exec -u laradock workspace cp phpunit.xml.dist phpunit.xml
-  if ! docker-compose exec workspace bash -c 'test -f /usr/local/bin/phive'; then
-    docker-compose exec workspace curl -fsSL https://phar.io/releases/phive.phar -o /tmp/phive.phar
-    docker-compose exec workspace curl -fsSL https://phar.io/releases/phive.phar.asc -o /tmp/phive.phar.asc
-    docker-compose exec workspace gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79
-    docker-compose exec workspace gpg --verify /tmp/phive.phar.asc /tmp/phive.phar
-    docker-compose exec workspace chmod +x /tmp/phive.phar
-    docker-compose exec workspace mv /tmp/phive.phar /usr/local/bin/phive
-  fi
-  docker-compose exec -u laradock workspace bash -c 'yes | phive --home .laradock/data/phive install --force-accept-unsigned'
-  docker-compose exec -u laradock workspace composer phar-extractor
-}
diff --git a/.laradock/env-development b/.laradock/env-development
index 77495cc..5ce2ae0 100644
--- a/.laradock/env-development
+++ b/.laradock/env-development
@@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock-ngmy-php-enum
 ### PHP Version ###########################################
 
 # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
-# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
+# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 PHP_VERSION=7.4
 
 ### Phalcon Version ###########################################
@@ -198,7 +198,9 @@ WORKSPACE_INSTALL_DOCKER_CLIENT=false
 WORKSPACE_INSTALL_LNAV=false
 WORKSPACE_INSTALL_PROTOC=false
 WORKSPACE_INSTALL_PHPDECIMAL=false
+WORKSPACE_INSTALL_ZOOKEEPER=false
 WORKSPACE_PROTOC_VERSION=latest
+WORKSPACE_INSTALL_MEMCACHED=true
 
 ### PHP_FPM ###############################################
 
@@ -213,6 +215,7 @@ PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
 PHP_FPM_INSTALL_PHPREDIS=true
 PHP_FPM_INSTALL_MEMCACHED=false
 PHP_FPM_INSTALL_BZ2=false
+PHP_FPM_INSTALL_ENCHANT=false
 PHP_FPM_INSTALL_GMP=false
 PHP_FPM_INSTALL_GNUPG=false
 PHP_FPM_INSTALL_XDEBUG=false
@@ -258,6 +261,7 @@ PHP_FPM_INSTALL_SSHPASS=false
 PHP_FPM_INSTALL_MAILPARSE=false
 PHP_FPM_INSTALL_WKHTMLTOPDF=false
 PHP_FPM_INSTALL_PHPDECIMAL=false
+PHP_FPM_INSTALL_ZOOKEEPER=false
 PHP_FPM_FFMPEG=false
 PHP_FPM_AUDIOWAVEFORM=false
 PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8"
@@ -282,9 +286,11 @@ PHP_WORKER_INSTALL_IMAGEMAGICK=false
 PHP_WORKER_IMAGEMAGICK_VERSION=latest
 PHP_WORKER_INSTALL_GMP=false
 PHP_WORKER_INSTALL_GNUPG=false
+PHP_WORKER_INSTALL_LDAP=false
 PHP_WORKER_INSTALL_PGSQL=false
 PHP_WORKER_INSTALL_MONGO=false
 PHP_WORKER_INSTALL_BCMATH=false
+PHP_WORKER_INSTALL_MEMCACHED=false
 # PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version
 PHP_WORKER_INSTALL_OCI8=false
 PHP_WORKER_INSTALL_PHALCON=false
@@ -322,6 +328,7 @@ LARAVEL_HORIZON_INSTALL_BZ2=false
 LARAVEL_HORIZON_INSTALL_GD=false
 LARAVEL_HORIZON_INSTALL_GMP=false
 LARAVEL_HORIZON_INSTALL_GNUPG=false
+LARAVEL_HORIZON_INSTALL_LDAP=false
 LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false
 LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest
 LARAVEL_HORIZON_INSTALL_SOCKETS=false
diff --git a/.phive/phars.xml b/.phive/phars.xml
index 794ff76..8b6944a 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -2,11 +2,11 @@
 <phive xmlns="https://phar.io/phive">
   <phar name="ngmy/phar-extractor" version="^0.1.0" installed="0.1.0" location="./tools/phar-extractor" copy="false"/>
   <phar name="php-coveralls" version="^2.4.3" installed="2.4.3" location="./tools/php-coveralls" copy="false"/>
-  <phar name="php-cs-fixer" version="^2.18.2" installed="2.18.6" location="./tools/php-cs-fixer" copy="false"/>
+  <phar name="php-cs-fixer" version="^2.18.2" installed="2.19.0" location="./tools/php-cs-fixer" copy="false"/>
   <phar name="phpcbf" version="^3.5.8" installed="3.6.0" location="./tools/phpcbf" copy="false"/>
   <phar name="phpcs" version="^3.5.8" installed="3.6.0" location="./tools/phpcs" copy="false"/>
   <phar name="phpdocumentor" version="^3.0.0" installed="3.0.0" location="./tools/phpDocumentor" copy="false"/>
-  <phar name="phpstan" version="^0.12.64" installed="0.12.84" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="^0.12.64" installed="0.12.86" location="./tools/phpstan" copy="false"/>
   <phar name="phpunit" version="^9.5.0" installed="9.5.4" location="./tools/phpunit" copy="false"/>
-  <phar name="psalm" version="^4.7.0" installed="4.7.0" location="./tools/psalm" copy="false"/>
+  <phar name="psalm" version="^4.7.0" installed="4.7.1" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/laradock b/laradock
index ecdfa17..4774281 160000
--- a/laradock
+++ b/laradock
@@ -1 +1 @@
-Subproject commit ecdfa174dc82771ff5effa3303b65505eb09ae8a
+Subproject commit 477428146e18c9038a4b094b01341f5fb573dd9f
diff --git a/laradockctl b/laradockctl
index ee5f326..6fa686f 160000
--- a/laradockctl
+++ b/laradockctl
@@ -1 +1 @@
-Subproject commit ee5f32686203083b58fcf22c912faef1c4326da5
+Subproject commit 6fa686f785181a0ea3321a9200cb6a7b08272ab6