diff --git a/.env b/.env
index ac918eb..85c5542 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-ARTEMIS_VERSION=feature/saml
+ARTEMIS_VERSION=develop
 ARTEMIS_GIT_REPOSITORY=https://github.com/kit-sdq/Artemis
 PROFILES=prod,jenkins,gitlab,artemis,scheduling,saml2
 
diff --git a/docker/artemis-client/Dockerfile b/docker/artemis-client/Dockerfile
index 0e67ebb..5da7225 100644
--- a/docker/artemis-client/Dockerfile
+++ b/docker/artemis-client/Dockerfile
@@ -5,7 +5,7 @@ ARG ARTEMIS_VERSION=main
 ####################
 # Build stage      #
 ####################
-FROM openjdk:15-jdk-buster AS build
+FROM openjdk:16-jdk-buster AS build
 
 ENV LC_ALL C
 
diff --git a/docker/artemis-server/Dockerfile b/docker/artemis-server/Dockerfile
index aa69801..64f3691 100644
--- a/docker/artemis-server/Dockerfile
+++ b/docker/artemis-server/Dockerfile
@@ -5,7 +5,7 @@ ARG ARTEMIS_VERSION=main
 ####################
 # Build stage      #
 ####################
-FROM openjdk:15-jdk-buster AS build
+FROM openjdk:16-jdk-buster AS build
 
 ENV LC_ALL C
 
@@ -19,16 +19,16 @@ RUN echo "Building from $ARTEMIS_GIT_REPOSITORY" \
   && mkdir /build && cd /build \
   && git clone --depth 1 --branch $ARTEMIS_VERSION $ARTEMIS_GIT_REPOSITORY \
   && cd Artemis \
-  && ./gradlew build -x webpack -x test -x jacocoTestCoverageVerification
+  && ./gradlew clean bootWar -Pprod -Pwar -x webpack -x test -x jacocoTestCoverageVerification
 
 RUN cd /build/Artemis \
-  && mv /build/Artemis/build/libs/Artemis-$(./gradlew properties -q | grep "^version:" | awk '{print $2}').jar \
+  && mv /build/Artemis/build/libs/Artemis-$(./gradlew properties -q | grep "^version:" | awk '{print $2}').war \
   /build/Artemis/build/libs/Artemis.jar
 
 ####################
 # Execution stage  #
 ####################
-FROM openjdk:15-jdk-buster
+FROM openjdk:16-jdk-buster
 
 ARG ARTEMIS_VERSION
 ARG GOSU_VERSION=1.12
diff --git a/docker/artemis-server/bootstrap.sh b/docker/artemis-server/bootstrap.sh
index af247c1..080ea89 100644
--- a/docker/artemis-server/bootstrap.sh
+++ b/docker/artemis-server/bootstrap.sh
@@ -35,6 +35,7 @@ exec gosu artemis java \
   -Xmx2048m \
   --add-modules java.se \
   --add-exports java.base/jdk.internal.ref=ALL-UNNAMED \
+  --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED \
   --add-opens java.base/java.lang=ALL-UNNAMED \
   --add-opens java.base/java.nio=ALL-UNNAMED \
   --add-opens java.base/sun.nio.ch=ALL-UNNAMED \