diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0602aab7ac5224f759cb7d225d9b1add14bf1b59..643fd36ba449824132d79e0719cc3d4c4269b983 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ variables:
   CI_REVISION: f-versioning
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-server/caosdb-server-testenv:$CI_REVISION
 
-image: $CI_REGISTRY_IMAGE
 stages:
   - setup
   - test
@@ -53,6 +52,7 @@ build-testenv:
 # Test: run unit tests of the server
 test:
   tags: [ docker ]
+  image: $CI_REGISTRY_IMAGE
   stage: test
   script:
     - mvn -v
@@ -66,6 +66,7 @@ test:
 # Deploy: Trigger building of server image and integration tests
 trigger_build:
   tags: [ docker ]
+  image: $CI_REGISTRY_IMAGE
   stage: deploy
   script:
     - /usr/bin/curl -X POST
diff --git a/caosdb-webui b/caosdb-webui
index 0a0c397312c25438243c073e384debe0b5629193..6e36ca65ca5950c93bb51a10c94e40a244f7ebcc 160000
--- a/caosdb-webui
+++ b/caosdb-webui
@@ -1 +1 @@
-Subproject commit 0a0c397312c25438243c073e384debe0b5629193
+Subproject commit 6e36ca65ca5950c93bb51a10c94e40a244f7ebcc