diff --git a/src/usr/local/bin/install-buildpack b/src/usr/local/bin/install-buildpack
deleted file mode 100755
index 6aa29a06aa..0000000000
--- a/src/usr/local/bin/install-buildpack
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo "WARNING: Command is deprecated and will be removed soon" >&2
-
-install-containerbase
diff --git a/src/usr/local/bin/install-gem b/src/usr/local/bin/install-gem
deleted file mode 100755
index a5ad81c7cb..0000000000
--- a/src/usr/local/bin/install-gem
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# shellcheck source=/dev/null
-. /usr/local/buildpack/util.sh
-
-echo "WARNING: Command is deprecated and will be removed soon" >&2
-
-require_user
-require_tool "$@"
-
-case "$TOOL_NAME" in
-  bundler | cocoapods)
-    echo "WARNING: Use 'install-tool $TOOL_NAME $TOOL_VERSION'" >&2
-    install-tool "$TOOL_NAME" "${TOOL_VERSION}"
-    ;;
-
-  *)
-    check_command gem
-
-    echo "Installing gem ${TOOL_NAME} v${TOOL_VERSION}"
-    gem install "${TOOL_NAME}" -v "${TOOL_VERSION}"
-    ;;
-esac
diff --git a/src/usr/local/bin/install-npm b/src/usr/local/bin/install-npm
deleted file mode 100755
index 4f1904df31..0000000000
--- a/src/usr/local/bin/install-npm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# shellcheck source=/dev/null
-. /usr/local/buildpack/util.sh
-
-echo "WARNING: Command is deprecated and will be removed soon" >&2
-
-require_user
-require_tool "$@"
-
-case "$TOOL_NAME" in
-  lerna | npm | pnpm | renovate | yarn)
-    echo "WARNING: Use 'install-tool $TOOL_NAME $TOOL_VERSION'" >&2
-    install-tool "$TOOL_NAME" "${TOOL_VERSION}"
-    ;;
-
-  *)
-    require_root
-    check_command npm
-    unset NPM_CONFIG_PREFIX
-
-    temp_folder=$(mktemp -u)
-    mkdir -p "${temp_folder}"
-
-    echo "Installing npm tool ${TOOL_NAME} v${TOOL_VERSION}"
-    npm install "${TOOL_NAME}@${TOOL_VERSION}" --global --unsafe --no-audit --no-fund --cache "${temp_folder}" --silent 2>&1
-
-    # Clean download cache
-    npm cache clean --force
-    # Clean node-gyp cache
-    rm -rf /root/.cache "${temp_folder}"
-    ;;
-esac
-
diff --git a/src/usr/local/bin/install-pip b/src/usr/local/bin/install-pip
deleted file mode 100755
index 82a0f1cd60..0000000000
--- a/src/usr/local/bin/install-pip
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# shellcheck source=/dev/null
-. /usr/local/buildpack/util.sh
-
-echo "WARNING: Command is deprecated and will be removed soon" >&2
-
-require_user
-require_tool "$@"
-
-case "$TOOL_NAME" in
-  hashin | pipenv | pip-tools | poetry)
-    echo "WARNING: Use 'install-tool $TOOL_NAME $TOOL_VERSION'" >&2
-    install-tool "$TOOL_NAME" "${TOOL_VERSION}"
-    ;;
-
-  *)
-    check_command python
-
-    echo "Installing pip tool ${TOOL_NAME} v${TOOL_VERSION}"
-    python -W ignore -m pip install \
-      --upgrade \
-      --use-pep517 \
-      --no-cache-dir \
-      --quiet \
-      "${TOOL_NAME}==${TOOL_VERSION}"
-    ;;
-esac
diff --git a/test/node/Dockerfile b/test/node/Dockerfile
index 9ee0162a7f..48e9633bb2 100644
--- a/test/node/Dockerfile
+++ b/test/node/Dockerfile
@@ -54,7 +54,7 @@ RUN npm --version
 USER 0
 
 # renovate: datasource=npm
-RUN install-npm re2 1.16.0
+RUN npm install -g re2@1.16.0
 
 #--------------------------------------
 # test: yarn
@@ -178,26 +178,15 @@ RUN npm --version
 RUN npm --version | grep '7.24.2'
 
 #--------------------------------------
-# test: npm (npm i -g npm)
+# test: unused
 #--------------------------------------
 FROM build as testf
 
-USER root
-# don't update!! need force to overwrite symlink
-RUN npm i -gf npm@8.0.0
-
-RUN set -ex; command -v npm; npm --version
-RUN set -ex; npm --version | grep '8.0.0'
-
-USER 1000
-# don't update!!
-RUN npm i -g npm@7.24.2
-RUN set -ex; command -v npm; npm --version
-RUN set -ex; npm --version | grep '7.24.2'
+# unused
 
 
 #--------------------------------------
-# test: npm (install-npm npm)
+# test: npm (npm install -g npm)
 #--------------------------------------
 FROM build as testg
 
@@ -205,7 +194,7 @@ SHELL [ "/bin/sh", "-c" ]
 
 USER root
 # don't update!!
-RUN set -ex; install-npm npm 8.0.0
+RUN set -ex; npm install -gf npm@8.0.0
 
 RUN set -ex; command -v npm; npm --version
 RUN set -ex; npm --version | grep '8.0.0'
@@ -491,7 +480,7 @@ COPY --from=testb /.dummy /.dummy
 COPY --from=testc /.dummy /.dummy
 COPY --from=testd /.dummy /.dummy
 COPY --from=teste /.dummy /.dummy
-COPY --from=testf /.dummy /.dummy
+# COPY --from=testf /.dummy /.dummy
 COPY --from=testg /.dummy /.dummy
 COPY --from=testh /.dummy /.dummy
 COPY --from=testi /.dummy /.dummy
diff --git a/test/python/Dockerfile b/test/python/Dockerfile
index dfd7f965ef..8ae979f45b 100644
--- a/test/python/Dockerfile
+++ b/test/python/Dockerfile
@@ -148,7 +148,7 @@ RUN set -ex; \
 FROM build-rootless as testb
 
 # renovate: datasource=pypi
-RUN install-pip pipenv 2023.5.19
+RUN install-tool pipenv 2023.5.19
 
 RUN set -ex; \
   cd a; \
diff --git a/test/ruby/Dockerfile b/test/ruby/Dockerfile
index e3cfbc8727..5d85f10809 100644
--- a/test/ruby/Dockerfile
+++ b/test/ruby/Dockerfile
@@ -72,7 +72,7 @@ FROM build as test-bundler-b
 RUN gem install bundler -v 1.17.2
 
 # renovate: datasource=rubygems versioning=ruby
-RUN install-gem bundler 2.4.13
+RUN install-tool bundler 2.4.13
 
 USER 1000
 
@@ -158,19 +158,11 @@ RUN set -ex; \
   pod install;
 
 #--------------------------------------
-# test: global cocoapods (install-gem)
+# test: unused
 #--------------------------------------
 FROM build3 as test-cocoapods-b
 
-# renovate: datasource=rubygems versioning=ruby
-RUN install-gem cocoapods 1.12.1
-
-USER 1000
-
-RUN set -ex; \
-  cd b/Project; \
-  gem install cocoapods-acknowledgements; \
-  pod install;
+# unused
 
 
 #--------------------------------------
@@ -185,26 +177,6 @@ RUN install-tool cocoapods 1.12.1
 
 RUN pod env
 
-RUN set -ex; \
-  cd b/Project; \
-  gem install cocoapods-acknowledgements; \
-  pod install;
-
-#--------------------------------------
-# test: cocoapods (install-gem, non-root)
-#--------------------------------------
-FROM base as test-cocoapods-d
-
-RUN prepare-tool ruby
-
-USER 1000
-
-# renovate: datasource=github-releases packageName=containerbase/ruby-prebuild versioning=ruby
-RUN install-tool ruby 3.2.2
-
-# renovate: datasource=rubygems versioning=ruby
-RUN install-gem cocoapods 1.12.1
-
 RUN set -ex; \
   cd b/Project; \
   gem install cocoapods-acknowledgements; \
@@ -220,6 +192,5 @@ COPY --from=test-bundler-b /.dummy /.dummy
 COPY --from=test-bundler-c /.dummy /.dummy
 COPY --from=test-bundler-d /.dummy /.dummy
 COPY --from=test-cocoapods-a /.dummy /.dummy
-COPY --from=test-cocoapods-b /.dummy /.dummy
+# COPY --from=test-cocoapods-b /.dummy /.dummy
 COPY --from=test-cocoapods-c /.dummy /.dummy
-COPY --from=test-cocoapods-d /.dummy /.dummy