diff --git a/.gitlab-ci-sage-lab.yml b/.gitlab-ci-sage-lab.yml
index 911132b6b00..f2fa0e3e771 100644
--- a/.gitlab-ci-sage-lab.yml
+++ b/.gitlab-ci-sage-lab.yml
@@ -27,8 +27,6 @@
       pip install -r test/py/requirements.txt -r tools/binman/requirements.txt
         -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt
         labgrid setuptools
-    # Add more tools
-    - sudo apt-get update && sudo apt-get -y install snmp rsync
     # Acquire and turn on the exporter.
     - labgrid-client reserve --wait board=${LABGRID_EXPORTER} &&
       labgrid-client -p ${LABGRID_EXPORTER} acquire &&
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index fd8765af458..bcb95a8cae3 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -131,7 +131,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 	python3-tomli \
 	python3-venv \
 	rpm2cpio \
+	rsync \
 	sbsigntool \
+	snmp \
 	socat \
 	softhsm2 \
 	sparse \