diff --git a/Makefile b/Makefile
index eab7c6dbe..8df05f7f6 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,6 @@ unversioned-images :=		commons \
 							nginx \
 							nginx-drupal \
 							mongo \
-							toolbox \
 							rabbitmq \
 							rabbitmq-cluster
 
@@ -180,7 +179,6 @@ build/commons: images/commons/Dockerfile
 build/mongo: build/commons images/mongo/Dockerfile
 build/nginx: build/commons images/nginx/Dockerfile
 build/nginx-drupal: build/nginx images/nginx-drupal/Dockerfile
-build/toolbox: build/commons build/mariadb-10.5 images/toolbox/Dockerfile
 build/rabbitmq: build/commons images/rabbitmq/Dockerfile
 build/rabbitmq-cluster: build/rabbitmq images/rabbitmq-cluster/Dockerfile
 
diff --git a/helpers/TESTING_dockercompose.md b/helpers/TESTING_dockercompose.md
index 2936e2763..de5e88c88 100644
--- a/helpers/TESTING_dockercompose.md
+++ b/helpers/TESTING_dockercompose.md
@@ -47,10 +47,9 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep all-images_redis-5_1
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep all-images_redis-6_1
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep all-images_solr-7_1
-docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep all-images_toolbox_1
 
-# toolbox Should be running Alpine Linux
-docker-compose exec -T toolbox sh -c "cat /etc/os-release" | grep "Alpine Linux"
+# commons Should be running Alpine Linux
+docker-compose exec -T commons sh -c "cat /etc/os-release" | grep "Alpine Linux"
 
 # rabbitmq Should have RabbitMQ running 3.8
 docker-compose exec -T rabbitmq sh -c "rabbitmqctl version" | grep 3.8
@@ -59,7 +58,7 @@ docker-compose exec -T rabbitmq sh -c "rabbitmqctl version" | grep 3.8
 docker-compose exec -T rabbitmq sh -c "rabbitmq-plugins list" | grep "E" | grep "delayed_message_exchange"
 
 # rabbitmq Should have a running RabbitMQ management page running on 15672
-docker-compose exec -T toolbox sh -c "curl -kL http://rabbitmq:15672" | grep "RabbitMQ Management"
+docker-compose exec -T commons sh -c "curl -kL http://rabbitmq:15672" | grep "RabbitMQ Management"
 
 # redis-5 Should be running Redis v5.0
 docker-compose exec -T redis-5 sh -c "redis-server --version" | grep v=5.
@@ -80,19 +79,19 @@ docker-compose exec -T redis-6 sh -c "redis-cli CONFIG GET databases"
 docker-compose exec -T redis-6 sh -c "redis-cli dbsize"
 
 # solr-7 Should have a "mycore" Solr core
-docker-compose exec -T toolbox sh -c "curl solr-7:8983/solr/admin/cores?action=STATUS\&core=mycore"
+docker-compose exec -T commons sh -c "curl solr-7:8983/solr/admin/cores?action=STATUS\&core=mycore"
 
 # solr-7 Should be able to reload "mycore" Solr core
-docker-compose exec -T toolbox sh -c "curl solr-7:8983/solr/admin/cores?action=RELOAD\&core=mycore"
+docker-compose exec -T commons sh -c "curl solr-7:8983/solr/admin/cores?action=RELOAD\&core=mycore"
 
 # solr-7 Check Solr has 7.7 solrconfig in "mycore" core
 docker-compose exec -T solr-7 sh -c "cat /opt/solr/server/solr/mycores/mycore/conf/solrconfig.xml" | grep 7.7
 
 # solr-7.7 Should have a "mycore" Solr core
-docker-compose exec -T toolbox sh -c "curl solr-7.7:8983/solr/admin/cores?action=STATUS\&core=mycore"
+docker-compose exec -T commons sh -c "curl solr-7.7:8983/solr/admin/cores?action=STATUS\&core=mycore"
 
 # solr-7.7 Should be able to reload "mycore" Solr core
-docker-compose exec -T toolbox sh -c "curl solr-7.7:8983/solr/admin/cores?action=RELOAD\&core=mycore"
+docker-compose exec -T commons sh -c "curl solr-7.7:8983/solr/admin/cores?action=RELOAD\&core=mycore"
 
 # solr-7.7 Check Solr has 7.7 solrconfig in "mycore" core
 docker-compose exec -T solr-7.7 sh -c "cat /opt/solr/server/solr/mycores/mycore/conf/solrconfig.xml" | grep 7.7
diff --git a/helpers/docker-compose.yml b/helpers/docker-compose.yml
index 05b51d4be..4420c6f8e 100644
--- a/helpers/docker-compose.yml
+++ b/helpers/docker-compose.yml
@@ -6,8 +6,8 @@ x-user:
     user: '1000'
 
 services:
-  toolbox:
-    image: uselagoon/toolbox:latest
+  commons:
+    image: uselagoon/commons:latest
     << : *default-user # uses the defined user from top
 
   mariadb-10.4:
diff --git a/images/toolbox/Dockerfile b/images/toolbox/Dockerfile
deleted file mode 100644
index c7f5d934a..000000000
--- a/images/toolbox/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-ARG IMAGE_REPO
-
-FROM ${IMAGE_REPO:-lagoon}/mariadb-10.5 as mariadb
-
-FROM ${IMAGE_REPO:-lagoon}/commons as commons
-
-LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
-LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
-
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache curl ncdu socat ca-certificates openssl perl perl-doc mysql-client rsync mariadb-mytop redis postgresql-client mongodb-tools openssh-client bind-tools \
-    && update-ca-certificates \
-    && rm -rf /var/cache/apk/* \
-    && wget https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl -O mysqltuner.pl \
-    && chmod +x mysqltuner.pl
-
-COPY --from=mariadb /usr/bin/my_print_defaults /usr/bin/my_print_defaults
diff --git a/images/toolbox/README.md b/images/toolbox/README.md
deleted file mode 100644
index ebba57de1..000000000
--- a/images/toolbox/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Lagoon Toolbox Container
-
-Container that comes with following tools that might get handy for daily operations:
-- curl
-- mysql-client
-- ncdu
-- openssl
-- socat
-- mongodb-tools
\ No newline at end of file