diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be73ae362e2f2041ba8219d4632d43b42b663108..2e179a8c8ad50726133fdc968efc5c1805510727 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -365,7 +365,9 @@ setup-env:
 # runs the unittests, currently validation tests for the profile schema
 unittest:
   tags: [ cached-dind ]
-  image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME"
+  image: "$CI_ENVIMAGE:dev"
+  # TODO: Fix this
+  # image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME"
   stage: unittest
   script:
     - ls
@@ -374,7 +376,9 @@ unittest:
 # builds a docker image with the LinkAhead Server
 build:
   tags: [ cached-dind ]
-  image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME"
+  # TODO: Fix this
+  # image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME"
+  image: "$CI_ENVIMAGE:dev"
   stage: build
   inherit:
     variables:
diff --git a/README_SETUP.md b/README_SETUP.md
index 7274d261a8d5272d371e953481c8510987c9ee2e..c3edbf45670e820381d0f0fbacdd454c5f0ec2ac 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -5,7 +5,7 @@ We use docker and docker-compose to deploy CaosDB:
 - Docker >= 18.02
 - docker-compose >= 1.21
 
-On a Debian system, you can install the requirements with:
+On Debian based systems, you can install the requirements with:
 
 ```sh
 sudo apt-get install docker.io docker-compose
@@ -91,6 +91,8 @@ one with `openssl rsa -in oldKey.pem -out newKey.key`. If you want to use a
 certificate with a passphrase instead, please refer to envoy's documentation as
 to how to configure this correctly.
 
+Make sure that envoy can read the certificate. You can set the UID for envoy in
+the environment section of the envoy service in `docker-compose.yml`.
 
 ## Configuration
 
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 88e9ef19433e2d8cf8fd6ba50a71d26c5482b19d..de6e0cd628bf61b7e45897a1491851a7f4e1217c 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -51,6 +51,8 @@ services:
 
   envoy:
     image: envoyproxy/envoy:v1.21-latest
+    # environment:
+    #   ENVOY_UID: 987
     volumes:
       - type: bind
         read_only: true