diff --git a/packages/common/.gitlab-ci.yml b/packages/common/.gitlab-ci.yml
index 14c05580c496faff4eb87a4e44924021e76dbd1e..79aa682a96015c4144d6bd0e36604d1e516b92d9 100644
--- a/packages/common/.gitlab-ci.yml
+++ b/packages/common/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v2
+image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v4
 
 before_script:
   - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules"
diff --git a/packages/common/.gitlab-ci/Dockerfile b/packages/common/.gitlab-ci/Dockerfile
index 3b830eaad65a820fa5ce80b653674b9171dfee53..ccdb25d64baed375a291ca563c4c23cb070e4fa3 100644
--- a/packages/common/.gitlab-ci/Dockerfile
+++ b/packages/common/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
 
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
@@ -13,8 +13,8 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
 
 RUN apt-get update && apt-get install -y \
     nodejs \
-    chromium-browser \
-    firefox \
+    chromium \
+    firefox-esr \
     composer \
     php-zip \
     rsync \
diff --git a/packages/common/.gitlab-ci/build.sh b/packages/common/.gitlab-ci/build.sh
index 1cd248205f435b8c946b1f58ba1b0f7dc92aa23f..01ca8e85611e72195c9f9ec814c2e4d0768f7f15 100755
--- a/packages/common/.gitlab-ci/build.sh
+++ b/packages/common/.gitlab-ci/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 set -e
-TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v3"
+TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v4"
 sudo docker build --tag "${TAG}" --file "Dockerfile" .
 echo "Now run: sudo docker push '$TAG'"