diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34aca70fe5e6276d60749bf11cf73d974a1c90eb..809f80719cce1542d5f9d3e833c01218e463494a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 linter:
-  image: registry.git.fsmpi.rwth-aachen.de/videoaginfra/testenvs/stretch
+  image: registry.git.fsmpi.rwth-aachen.de/videoaginfra/testenvs/bullseye
   stage: test
   script:
   - uname -a
@@ -11,7 +11,7 @@ linter:
       - pylint.txt
 
 unittest: &unittest
-  image: registry.git.fsmpi.rwth-aachen.de/videoaginfra/testenvs/stretch
+  image: registry.git.fsmpi.rwth-aachen.de/videoaginfra/testenvs/bullseye
   stage: test
   script:
   - uname -a
@@ -25,27 +25,3 @@ unittest: &unittest
       - htmlcov/*
       - .coverage
       - report.txt
-
-# Buster is not supported for now
-#
-#unittest_buster:
-#  <<: *unittest
-#  image: debian:buster
-#
-#livetest:
-#  image: debian:stretch
-#  stage: test
-#  script:
-#  - apt update
-#  - apt install -y python3
-#  - python3 -V
-#  - uname -a
-#  - apt install -y python3-requests
-#    - ./tests/urlcheck_sinf.py
-#
-#deploy_staging:
-#  image: archlinux/base
-#  stage: deploy
-#  script:
-#  - pacman --noconfirm -Sy ansible git
-#