diff --git a/component-consistency-check-tool/b-7.3.x-components.sh b/component-consistency-check-tool/b-7.3.x-components.sh
new file mode 100755
index 0000000..e8a220b
--- /dev/null
+++ b/component-consistency-check-tool/b-7.3.x-components.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+# Flags possible:
+# -e for shop edition. Possible values: CE/EE
+
+edition='EE'
+while getopts e: flag; do
+  case "${flag}" in
+  e) edition=${OPTARG} ;;
+  *) ;;
+  esac
+done
+
+SCRIPT_PATH=$(dirname ${BASH_SOURCE[0]})
+
+cd $SCRIPT_PATH/../../../ || exit
+
+# Prepare services configuration
+make setup
+make addbasicservices
+make file=services/adminer.yml addservice
+make file=services/selenium-chrome.yml addservice
+
+# Configure containers
+perl -pi\
+  -e 's#error_reporting = .*#error_reporting = E_ALL ^ E_WARNING ^ E_DEPRECATED#g;'\
+  containers/php/custom.ini
+
+perl -pi\
+  -e 's#/var/www/#/var/www/source/#g;'\
+  containers/httpd/project.conf
+
+perl -pi\
+  -e 's#PHP_VERSION=.*#PHP_VERSION=8.2#g;'\
+  .env
+
+mkdir source
+docker compose up --build -d php
+
+cp ${SCRIPT_PATH}/../parts/bases/composer.json.base ./source/composer.json
+
+$SCRIPT_PATH/../parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.3.x"
+$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.3.x"
+$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/consistency-check-tool" -g"https://github.com/OXID-eSales/consistency-check-tool.git" -v"dev-b-7.3.x-prepare-recipe-OXDEV-9095"
+
+docker compose exec php composer update --no-interaction
+
+perl -pi\
+  -e 'print "SetEnvIf Authorization \"(.*)\" HTTP_AUTHORIZATION=\$1\n\n" if $. == 1'\
+  source/source/.htaccess
+
+make up
+
+$SCRIPT_PATH/../parts/shared/setup_database.sh --no-demodata
+
+
+$SCRIPT_PATH/../parts/shared/create_admin.sh
+
+# Register all related project packages git repositories
+mkdir -p .idea; mkdir -p source/.idea; cp "${SCRIPT_PATH}/../parts/bases/vcs.xml.base" .idea/vcs.xml
+perl -pi\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-ce" vcs="Git" />\n  </component>#g;'\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-pe" vcs="Git" />\n  </component>#g;'\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-ee" vcs="Git" />\n  </component>#g;'\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/consistency-check-tool" vcs="Git" />\n  </component>#g;'\
+  .idea/vcs.xml
+cp .idea/vcs.xml source/.idea/vcs.xml; perl -pi -e 's#/source/vendor/#/vendor/#g;' source/.idea/vcs.xml
\ No newline at end of file
diff --git a/component-consistency-check-tool/b-7.3.x-root.sh b/component-consistency-check-tool/b-7.3.x-root.sh
deleted file mode 100755
index 388365f..0000000
--- a/component-consistency-check-tool/b-7.3.x-root.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-# Flags possible:
-# -e for shop edition. Possible values: CE/EE
-
-edition='EE'
-while getopts e: flag; do
-  case "${flag}" in
-  e) edition=${OPTARG} ;;
-  *) ;;
-  esac
-done
-
-SCRIPT_PATH=$(dirname ${BASH_SOURCE[0]})
-
-cd $SCRIPT_PATH/../../../ || exit
-
-# Prepare services configuration
-make setup
-make addbasicservices
-make file=services/adminer.yml addservice
-make file=services/selenium-chrome.yml addservice
-
-# Configure containers
-perl -pi\
-  -e 's#error_reporting = .*#error_reporting = E_ALL ^ E_DEPRECATED#g;'\
-  containers/php/custom.ini
-
-perl -pi\
-  -e 's#/var/www/#/var/www/source/#g;'\
-  containers/httpd/project.conf
-
-perl -pi\
-  -e 's#PHP_VERSION=.*#PHP_VERSION=8.2#g;'\
-  .env
-
-mkdir source
-docker compose up --build -d php
-
-git clone https://github.com/OXID-eSales/consistency-check-tool ./source -b b-7.3.x
-
-$SCRIPT_PATH/../parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.3.x"
-
-docker compose exec php composer update --no-interaction
-
-make up
-
-$SCRIPT_PATH/../parts/shared/setup_database.sh --no-demodata
-
-$SCRIPT_PATH/../parts/shared/create_admin.sh
\ No newline at end of file