diff --git a/packages/common/.gitlab-ci.yml b/packages/common/.gitlab-ci.yml
index c1159ca58913fe0c8ec6d720b5a9aa706a5594a8..14c05580c496faff4eb87a4e44924021e76dbd1e 100644
--- a/packages/common/.gitlab-ci.yml
+++ b/packages/common/.gitlab-ci.yml
@@ -1,8 +1,6 @@
-image: debian:buster
+image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v2
 
 before_script:
-  - apt update
-  - apt install -y git
   - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules"
   - git submodule sync
   - git submodule update --init
@@ -13,7 +11,5 @@ stages:
 test:
   stage: test
   script:
-    - apt update
-    - apt install -y npm chromium
     - npm install
     - npm test
diff --git a/packages/common/.gitlab-ci/Dockerfile b/packages/common/.gitlab-ci/Dockerfile
index ead6a355e5258231ba3c0d91dff46ca851e2b700..82fb40857108bb460d1c2ca15ac14d9723b71e84 100644
--- a/packages/common/.gitlab-ci/Dockerfile
+++ b/packages/common/.gitlab-ci/Dockerfile
@@ -5,13 +5,21 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get install -y \
     git \
-    curl
+    curl \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update && apt-get install -y \
     nodejs \
     chromium-browser \
     firefox \
     composer \
-    rsync
\ No newline at end of file
+    rsync \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd -u 1000 -ms /bin/bash user
+RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+USER user
diff --git a/packages/common/.gitlab-ci/build.sh b/packages/common/.gitlab-ci/build.sh
index b5705519d601825be3835d2158e2593b43bbe8ca..3ec24350bd7dfb96a7d17da1b1780055d145bef9 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:v1"
+TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v2"
 sudo docker build --tag "${TAG}" --file "Dockerfile" .
 echo "Now run: sudo docker push '$TAG'"