diff --git a/deploy/docker/compose/src/main/scripts/.env.sample b/deploy/docker/compose/src/main/scripts/.env.sample
index 41de62c8..b41e94e2 100644
--- a/deploy/docker/compose/src/main/scripts/.env.sample
+++ b/deploy/docker/compose/src/main/scripts/.env.sample
@@ -114,15 +114,24 @@
 # --- relative login path from external authentication service
 # REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGIN=/shibboleth
 
-# --- relative logout path from external authentication service
-# REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT=/logout
-
 # --- absolut path from external authentication provider
 # REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL=
 
 # --- relative logout path from external authentication target provider
 # REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL=
 
+# --- relative logout path from external authentication service
+# REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT=/Shibboleth.sso/Logout
+
+# --- should edu-sharing destroy it's session or does this the idp for us
+# REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION=false
+
+# --- should edu-sharing redirected us to a page after the logout?
+# REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT=false
+
+# --- the url to redirect to if redirect is true
+# REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL=
+
 # --- guest user name
 # REPOSITORY_SERVICE_GUEST_USER=
 
@@ -216,6 +225,11 @@
 # --- public url protocol
 # SERVICES_RENDERING_SERVICE_PROT=http
 
+# --- use dynamic url
+# SERVICES_RENDERING_SERVICE_DYNAMIC_URL=false
+
+# --- custom content url
+# SERVICES_RENDERING_SERVICE_CUSTOM_CONTENT_URL=
 
 # --- enables general data protection regulation
 # SERVICES_RENDERING_SERVICE_GDPR_ENABLED=false
@@ -239,12 +253,15 @@
 # SERVICES_RENDERING_RENDERMOODLE_URL=https://moodle.example/
 # SERVICES_RENDERING_RENDERMOODLE_TOKEN=
 # SERVICES_RENDERING_RENDERMOODLE_CATEGORY_ID=1
+# SERVICES_RENDERING_RENDERMOODLE_TIMEOUT=90
 
 # --- media converter settings
 # SERVICES_RENDERING_AUDIO_FORMATS=mp3
 # SERVICES_RENDERING_VIDEO_FORMATS=mp4,webm
 # SERVICES_RENDERING_VIDEO_RESOLUTIONS=240,720,1080
 # SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION=720
+# SERVICES_RENDERING_VIDEO_TIMEOUT=3600
+# SERVICES_RENDERING_VIDEO_THREADS=1
 
 ########################################################################################################################
 # ONLY FOR DEBUGGING
diff --git a/deploy/docker/repository/build/search/solr4/src/main/build/Dockerfile b/deploy/docker/repository/build/search/solr4/src/main/build/Dockerfile
index dda645d1..23012a59 100644
--- a/deploy/docker/repository/build/search/solr4/src/main/build/Dockerfile
+++ b/deploy/docker/repository/build/search/solr4/src/main/build/Dockerfile
@@ -122,7 +122,7 @@ USER worker
 EXPOSE 8080
 
 ENTRYPOINT ["entrypoint.sh"]
-CMD ["catalina.sh", "run"]
+CMD [ "/opt/bitnami/scripts/tomcat/run.sh" ]
 
 VOLUME [ "/opt/alfresco/alf_data" ]
 
diff --git a/deploy/docker/repository/build/search/solr4/src/main/build/assets/entrypoint.sh b/deploy/docker/repository/build/search/solr4/src/main/build/assets/entrypoint.sh
index 91ca758e..43ad82bf 100755
--- a/deploy/docker/repository/build/search/solr4/src/main/build/assets/entrypoint.sh
+++ b/deploy/docker/repository/build/search/solr4/src/main/build/assets/entrypoint.sh
@@ -87,11 +87,4 @@ fi
 
 ########################################################################################################################
 
-# Load libraries
-. /opt/bitnami/scripts/libtomcat.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load Tomcat environment variables
-. /opt/bitnami/scripts/tomcat-env.sh
-
-exec "$@"
+exec /opt/bitnami/scripts/tomcat/entrypoint.sh "$@"
diff --git a/deploy/docker/repository/build/service/src/main/build/Dockerfile b/deploy/docker/repository/build/service/src/main/build/Dockerfile
index d0a3a8e2..cdfec320 100644
--- a/deploy/docker/repository/build/service/src/main/build/Dockerfile
+++ b/deploy/docker/repository/build/service/src/main/build/Dockerfile
@@ -116,7 +116,10 @@ RUN set -eux \
     && mv alf_data/keystore .
 
 RUN set -eux \
-    && xmlstarlet ed -L -d '/Context/Loader' tomcat/conf/Catalina/localhost/alfresco.xml
+    && xmlstarlet ed -L \
+      -i '/Context' -t attr -n 'unloadDelay' -v "15000" \
+      -d '/Context/Loader' \
+      tomcat/conf/Catalina/localhost/alfresco.xml
 
 COPY --chown=worker:worker artifacts/alfresco-content-services-share-distribution-${org.alfresco:alfresco-content-services-share-distribution:zip.version}.zip \
     /tmp/alfresco-content-services-share-distribution.zip
@@ -137,7 +140,10 @@ RUN set -eux \
     && rm -f tomcat/webapps/share.war
 
 RUN set -eux \
-    && xmlstarlet ed -L -d '/Context/Loader' tomcat/conf/Catalina/localhost/share.xml
+    && xmlstarlet ed -L \
+      -i '/Context' -t attr -n 'unloadDelay' -v "15000" \
+      -d '/Context/Loader' \
+      tomcat/conf/Catalina/localhost/share.xml
 
 COPY --chown=worker:worker assets/share/log4j.properties tomcat/webapps/share/WEB-INF/classes/log4j.properties
 
@@ -194,18 +200,15 @@ COPY --chown=worker:worker assets/profiler profiler/
 
 USER worker
 
-STOPSIGNAL SIGWINCH
-
 EXPOSE 8009 8080 8081
 
 ENTRYPOINT ["entrypoint.sh"]
-CMD ["catalina.sh", "run"]
+CMD [ "/opt/bitnami/scripts/tomcat/run.sh" ]
 
 VOLUME [ "/opt/alfresco/alf_data", "/opt/bitnami/tomcat/shared/classes/config/cluster", "/opt/bitnami/tomcat/shared/classes/config/node" ]
 
 ########################################################################################################################
 
-
 LABEL git.branch=${git.branch}
 LABEL git.closest.tag.name=${git.closest.tag.fixed}
 LABEL git.commit.id=${git.commit.id}
diff --git a/deploy/docker/repository/build/service/src/main/build/assets/entrypoint.sh b/deploy/docker/repository/build/service/src/main/build/assets/entrypoint.sh
index e0a1f62c..78fc3ff0 100755
--- a/deploy/docker/repository/build/service/src/main/build/assets/entrypoint.sh
+++ b/deploy/docker/repository/build/service/src/main/build/assets/entrypoint.sh
@@ -26,7 +26,12 @@ my_home_appid="${REPOSITORY_SERVICE_HOME_APPID:-local}"
 my_home_auth="${REPOSITORY_SERVICE_HOME_AUTH:-}"
 my_home_auth_external="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL:-false}"
 my_home_auth_external_login="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN:-$my_path_external/shibboleth}"
-my_home_auth_external_logout="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT:-}"
+
+my_home_auth_external_logout="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT:-/Shibboleth.sso/Logout}"
+my_home_auth_external_logout_destroy_session="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION:-"false"}"
+my_home_auth_external_logout_redirect="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT:-"false"}"
+my_home_auth_external_logout_redirect_url="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL:-$my_base_external}"
+
 my_home_auth_external_login_providers_url="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL:-}"
 my_home_auth_external_login_provider_target_url="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL:-}"
 my_home_provider="${REPOSITORY_SERVICE_HOME_PROVIDER:-}"
@@ -451,19 +456,25 @@ xmlstarlet ed -L \
           -s '/config/values' -t elem -n 'loginProviderTargetUrl' -v '' \
           -d '/config/values/loginProviderTargetUrl[position() != 1]' \
     			-u '/config/values/loginProviderTargetUrl' -v "${my_home_auth_external_login_provider_target_url}" \
+    			-s '/config/values' -t elem -n 'logout' -v '' \
+          -d '/config/values/logout[position() != 1]' \
+          -s '/config/values/logout' -t elem -n 'url' -v '' \
+          -d '/config/values/logout/url[position() != 1]' \
+          -u '/config/values/logout/url' -v "${my_home_auth_external_logout}" \
+          -s '/config/values/logout' -t elem -n 'destroySession' -v '' \
+          -d '/config/values/logout/destroySession[position() != 1]' \
+          -u '/config/values/logout/destroySession' -v "${my_home_auth_external_logout_destroy_session}" \
           ${eduCConf}
 
-          if [[ -n "${my_home_auth_external_logout}" ]] ; then
-             xmlstarlet ed -L \
-                  -s '/config/values' -t elem -n 'logout' -v '' \
-                  -d '/config/values/logout[position() != 1]' \
-                  -s '/config/values/logout' -t elem -n 'url' -v '' \
-                  -d '/config/values/logout/url[position() != 1]' \
-                  -u '/config/values/logout/url' -v "${my_home_auth_external_logout}" \
-                  -s '/config/values/logout' -t elem -n 'destroySession' -v '' \
-                  -d '/config/values/logout/destroySession[position() != 1]' \
-                  -u '/config/values/logout/destroySession' -v 'false' \
-                  ${eduCConf}
+          if [[ "${my_home_auth_external_logout_redirect}" == "true" ]] ; then
+            xmlstarlet ed -L \
+              -s '/config/values/logout' -t elem -n 'ajax' -v '' \
+              -d '/config/values/logout/ajax[position() != 1]' \
+              -u '/config/values/logout/ajax' -v 'true' \
+              -s '/config/values/logout' -t elem -n 'next' -v '' \
+              -d '/config/values/logout/next[position() != 1]' \
+              -u '/config/values/logout/next' -v "${my_home_auth_external_logout_redirect_url}" \
+              ${eduCConf}
           fi
   else
 		sed -i -r 's|<!--\s*SAML||g' tomcat/webapps/edu-sharing/WEB-INF/web.xml
@@ -715,11 +726,4 @@ done
 
 ########################################################################################################################
 
-# Load libraries
-. /opt/bitnami/scripts/libtomcat.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load Tomcat environment variables
-. /opt/bitnami/scripts/tomcat-env.sh
-
-exec "$@"
+exec /opt/bitnami/scripts/tomcat/entrypoint.sh "$@"
diff --git a/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml b/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml
index 7dd100b8..e172c67b 100644
--- a/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml
+++ b/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml
@@ -82,6 +82,9 @@ services:
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL: "${REPOSITORY_SERVICE_AUTH_EXTERNAL:-false}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN: "${REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGIN:-}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT: "${REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT:-}"
+      REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION:-false}"
+      REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT:-}"
+      REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL:-}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL:-}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL:-}"
       REPOSITORY_SERVICE_HOME_PROVIDER: "${REPOSITORY_SERVICE_PROVIDER:-}"
diff --git a/deploy/docker/repository/compose/src/main/compose/1_repository-debug.yml b/deploy/docker/repository/compose/src/main/compose/1_repository-debug.yml
index 0ddaf533..3023ea92 100644
--- a/deploy/docker/repository/compose/src/main/compose/1_repository-debug.yml
+++ b/deploy/docker/repository/compose/src/main/compose/1_repository-debug.yml
@@ -11,16 +11,30 @@ services:
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_MAILCATCHER_PORT_HTTP:-8025}:1080"
 
   repository-search-solr4:
-    command: ["catalina.sh", "jpda", "run"]
     environment:
-      JPDA_ADDRESS: "0.0.0.0:5005"
+      CATALINA_OPTS: >-
+        -Xms${REPOSITORY_SEARCH_SOLR4_JAVA_XMS:-512m}
+        -Xmx${REPOSITORY_SEARCH_SOLR4_JAVA_XMX:-512m}
+        -Dcom.sun.management.jmxremote
+        -Dcom.sun.management.jmxremote.authenticate=false
+        -Dcom.sun.management.jmxremote.port=7199
+        -Dcom.sun.management.jmxremote.ssl=false
+        -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
+        -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
     ports:
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_SEARCH_SOLR4_PORT_HTTP:-8200}:8080"
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_SEARCH_SOLR4_PORT_JPDA:-8201}:5005"
 
   repository-service:
-    command: ["catalina.sh", "jpda", "run"]
     environment:
-      JPDA_ADDRESS: "0.0.0.0:5005"
+      CATALINA_OPTS: >-
+        -Xms${REPOSITORY_SERVICE_JAVA_XMS:-2g}
+        -Xmx${REPOSITORY_SERVICE_JAVA_XMX:-4g}
+        -Dcom.sun.management.jmxremote
+        -Dcom.sun.management.jmxremote.authenticate=false
+        -Dcom.sun.management.jmxremote.port=7199
+        -Dcom.sun.management.jmxremote.ssl=false
+        -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
+        -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
     ports:
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_SERVICE_PORT_JPDA:-8101}:5005"
diff --git a/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-env.yaml b/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-env.yaml
index e9137364..b1ddeb71 100644
--- a/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-env.yaml
+++ b/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-env.yaml
@@ -31,7 +31,9 @@ data:
     {{- if .Values.config.metrics.enabled }}
     -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
     {{- end }}
-  JPDA_ADDRESS: "0.0.0.0:5005"
+    {{- if default .Values.global.debug .Values.debug }}
+    -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
+    {{- end }}
   {{- if .Values.config.antivirus.enabled }}
   REPOSITORY_ANTIVIRUS_SERVER_HOST: {{ .Values.config.antivirus.host | quote }}
   REPOSITORY_ANTIVIRUS_SERVER_PORT: {{ .Values.config.antivirus.port | quote }}
diff --git a/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-file.yaml b/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-file.yaml
index e39bfdd9..9b14bc7e 100644
--- a/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-file.yaml
+++ b/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-file.yaml
@@ -50,6 +50,10 @@ data:
         return (synth(200, "OK"));
       }
 
+      if (req.method == "POST" || req.method == "PUT" || req.method == "DELETE" || req.url ~ "/rest/") {
+        return (pass);
+      }
+
       if (req.restarts > 0) {
         set req.hash_always_miss = true;
       }
diff --git a/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml b/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml
index 497b2e02..2e9f6832 100644
--- a/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml
+++ b/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml
@@ -70,9 +70,6 @@ spec:
       - name: {{ include "edusharing_repository_service.name" . }}-server
         image: {{ include "edusharing_repository_service.image" . }}{{ .Values.image.prefix }}-deploy-docker-repository-build-service:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-        {{- if default .Values.global.debug .Values.debug }}
-        args: [ "catalina.sh", "jpda", "run" ]
-        {{- end }}
         {{- $patroni := merge .Values.config.database.patroni .Values.global.patroni }}
         {{- if $patroni.enabled }}
         env:
diff --git a/deploy/docker/repository/helm/solr4/src/main/chart/templates/configmap-env.yaml b/deploy/docker/repository/helm/solr4/src/main/chart/templates/configmap-env.yaml
index 0a5d7604..278a8951 100644
--- a/deploy/docker/repository/helm/solr4/src/main/chart/templates/configmap-env.yaml
+++ b/deploy/docker/repository/helm/solr4/src/main/chart/templates/configmap-env.yaml
@@ -19,7 +19,9 @@ data:
     {{- if .Values.config.metrics.enabled }}
     -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
     {{- end }}
-  JPDA_ADDRESS: "0.0.0.0:5005"
+    {{- if default .Values.global.debug .Values.debug }}
+    -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
+    {{- end }}
   {{- with .Values.config.override.application.common }}
   REPOSITORY_SEARCH_SOLR4_CONFIG: | {{ . | nindent 4 }}
   {{- end }}
diff --git a/deploy/docker/repository/helm/solr4/src/main/chart/templates/statefulset.yaml b/deploy/docker/repository/helm/solr4/src/main/chart/templates/statefulset.yaml
index 505f3351..177e1fa7 100644
--- a/deploy/docker/repository/helm/solr4/src/main/chart/templates/statefulset.yaml
+++ b/deploy/docker/repository/helm/solr4/src/main/chart/templates/statefulset.yaml
@@ -60,9 +60,6 @@ spec:
       - name: {{ include "edusharing_repository_search_solr4.name" . }}
         image: {{ include "edusharing_repository_search_solr4.image" . }}{{ .Values.image.prefix }}-deploy-docker-repository-build-search-solr4:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-        {{- if default .Values.global.debug .Values.debug }}
-        args: [ "catalina.sh", "jpda", "run" ]
-        {{- end }}
         envFrom:
         - configMapRef:
             name: {{ include "edusharing_repository_search_solr4.name" . }}-env
@@ -235,9 +232,6 @@ spec:
       - name: {{ include "edusharing_repository_search_solr4.name" $ }}
         image: {{ include "edusharing_repository_search_solr4.image" $ }}{{ $.Values.image.prefix }}-deploy-docker-repository-build-search-solr4:{{ $.Values.image.tag }}
         imagePullPolicy: {{ $.Values.global.image.pullPolicy }}
-        {{- if default $.Values.global.debug $.Values.debug }}
-        args: [ "catalina.sh", "jpda", "run" ]
-        {{- end }}
         env:
         - name: REPOSITORY_SEARCH_SOLR4_CONFIG
           value: | {{ .spec.config.override.application.common | nindent 12 }}
diff --git a/deploy/docker/services/rendering/build/service/src/main/build/assets/entrypoint.sh b/deploy/docker/services/rendering/build/service/src/main/build/assets/entrypoint.sh
index 6627f1e2..7f777da0 100755
--- a/deploy/docker/services/rendering/build/service/src/main/build/assets/entrypoint.sh
+++ b/deploy/docker/services/rendering/build/service/src/main/build/assets/entrypoint.sh
@@ -4,7 +4,8 @@ set -eu
 
 ########################################################################################################################
 
-$(chmod g+w "$RS_CACHE/config" "$RS_CACHE/data") || echo "set group permission for shared volumes skipped."
+$(chmod -R g+w "$RS_CACHE/config") || echo "set group permission for $RS_CACHE/config."
+$(chmod    g+w "$RS_CACHE/data"  ) || echo "set group permission for $RS_CACHE/data."
 
 ########################################################################################################################
 
@@ -18,6 +19,17 @@ my_port_external="${SERVICES_RENDERING_SERVICE_PORT_EXTERNAL:-9100}"
 my_path_external="${SERVICES_RENDERING_SERVICE_PATH_EXTERNAL:-/esrender}"
 my_base_external="${my_prot_external}://${my_host_external}:${my_port_external}${my_path_external}"
 
+# used to configure dynamic domains based on the accessing domains
+# used to configure dynamic domains based on the accessing domains
+
+rendering_service_custom_content_url="${SERVICES_RENDERING_SERVICE_CUSTOM_CONTENT_URL:-}"
+rendering_service_dynamic_url="${SERVICES_RENDERING_SERVICE_DYNAMIC_URL:-false}"
+
+my_external_url="${my_base_external}"
+if [[ "$rendering_service_dynamic_url" == "true" ]]; then
+  my_external_url="${my_prot_external}://'.(\$_SERVER['HTTP_X_FORWARDED_HOST'] ? \$_SERVER['HTTP_X_FORWARDED_HOST'] : \$_SERVER['HTTP_HOST']).':${my_port_external}${my_path_external}"
+fi
+
 my_prot_internal="${SERVICES_RENDERING_SERVICE_PROT_INTERNAL:-http}"
 my_host_internal="${SERVICES_RENDERING_SERVICE_HOST_INTERNAL:-services-rendering-service}"
 my_port_internal="${SERVICES_RENDERING_SERVICE_PORT_INTERNAL:-8080}"
@@ -56,6 +68,7 @@ repository_service_port="${REPOSITORY_SERVICE_PORT:-8080}"
 rendering_rendermoodle_url="${SERVICES_RENDERING_RENDERMOODLE_URL:-}"
 rendering_rendermoodle_token="${SERVICES_RENDERING_RENDERMOODLE_TOKEN:-}"
 rendering_rendermoodle_category_id="${SERVICES_RENDERING_RENDERMOODLE_CATEGORY_ID:-1}"
+rendering_rendermoodle_timeout="${SERVICES_RENDERING_RENDERMOODLE_TIMEOUT:-90}"
 
 repository_service_base="http://${repository_service_host}:${repository_service_port}/edu-sharing"
 
@@ -63,6 +76,10 @@ rendering_audio_formats="${SERVICES_RENDERING_AUDIO_FORMATS:-"mp3"}"
 rendering_video_formats="${SERVICES_RENDERING_VIDEO_FORMATS:-"mp4,webm"}"
 rendering_video_resolutions="${SERVICES_RENDERING_VIDEO_RESOLUTIONS:-"240,720,1080"}"
 rendering_video_default_resolution="${SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION:-"720"}"
+rendering_video_timeout="${SERVICES_RENDERING_VIDEO_TIMEOUT:-"3600"}"
+rendering_video_threads="${SERVICES_RENDERING_VIDEO_THREADS:-"1"}"
+
+
 
 ### Wait ###############################################################################################################
 
@@ -142,7 +159,7 @@ if [[ ! -f "${RS_CACHE}/config/version.json" ]]; then
 	cat >/tmp/config.ini <<-EOF
 		[application]
 		; url for client requests (accessible from the internet)
-		application_url_client="${my_base_external}"
+		application_url_client="${my_external_url}"
 		; url for requests from repository
 		application_url_repository="${my_base_internal}"
 		; ip of the server
@@ -213,18 +230,30 @@ fi
 ########################################################################################################################
 
 # rendermoodle config
-rm -f "${RS_ROOT}/modules/moodle/config.php"
-rm -f "${RS_ROOT}/modules/scorm/config.php"
+moodleConfFile="${RS_ROOT}/modules/moodle/config.php"
+scormConfFile="${RS_ROOT}/modules/scorm/config.php"
+rm -f "${moodleConfFile}"
+rm -f "${scormConfFile}"
 if [[ -n "${rendering_rendermoodle_url}" ]]; then
-  cp "${RS_ROOT}/modules/moodle/config.php.dist" "${RS_ROOT}/modules/moodle/config.php"
-  sed -i "s|define('MOODLE_BASE_DIR', '');.*|define('MOODLE_BASE_DIR', '${rendering_rendermoodle_url}');|" "${RS_ROOT}/modules/moodle/config.php"
-  sed -i "s|define('MOODLE_TOKEN', '');.*|define('MOODLE_TOKEN', '${rendering_rendermoodle_token}');|" "${RS_ROOT}/modules/moodle/config.php"
-  sed -i "s|define('MOODLE_CATEGORY_ID', '1');.*|define('MOODLE_CATEGORY_ID', '${rendering_rendermoodle_category_id}');|" "${RS_ROOT}/modules/moodle/config.php"
-
-  cp "${RS_ROOT}/modules/scorm/config.php.dist" "${RS_ROOT}/modules/scorm/config.php"
-  sed -i "s|define('MOODLE_BASE_DIR', '');.*|define('MOODLE_BASE_DIR', '${rendering_rendermoodle_url}');|" "${RS_ROOT}/modules/scorm/config.php"
-  sed -i "s|define('MOODLE_TOKEN', '');.*|define('MOODLE_TOKEN', '${rendering_rendermoodle_token}');|" "${RS_ROOT}/modules/scorm/config.php"
-  sed -i "s|define('MOODLE_CATEGORY_ID', '1');.*|define('MOODLE_CATEGORY_ID', '${rendering_rendermoodle_category_id}');|" "${RS_ROOT}/modules/scorm/config.php"
+  cp "${RS_ROOT}/modules/moodle/config.php.dist" "${moodleConfFile}"
+  sed -i "s|define('MOODLE_BASE_DIR', '');.*|define('MOODLE_BASE_DIR', '${rendering_rendermoodle_url}');|" "${moodleConfFile}"
+  sed -i "s|define('MOODLE_TOKEN', '');.*|define('MOODLE_TOKEN', '${rendering_rendermoodle_token}');|" "${moodleConfFile}"
+  sed -i "s|define('MOODLE_CATEGORY_ID', '1');.*|define('MOODLE_CATEGORY_ID', '${rendering_rendermoodle_category_id}');|" "${moodleConfFile}"
+
+  sed -i "s|define('MOODLE_TIMEOUT', .*|define('MOODLE_TIMEOUT', ${rendering_rendermoodle_timeout});|" "${moodleConfFile}"
+  grep -q "define('MOODLE_TIMEOUT'" "${moodleConfFile}" || echo "define('MOODLE_TIMEOUT', ${rendering_rendermoodle_timeout});" >> "${moodleConfFile}"
+
+
+
+  cp "${RS_ROOT}/modules/scorm/config.php.dist" "${scormConfFile}"
+  sed -i "s|define('MOODLE_BASE_DIR', '');.*|define('MOODLE_BASE_DIR', '${rendering_rendermoodle_url}');|" "${scormConfFile}"
+  sed -i "s|define('MOODLE_TOKEN', '');.*|define('MOODLE_TOKEN', '${rendering_rendermoodle_token}');|" "${scormConfFile}"
+  sed -i "s|define('MOODLE_CATEGORY_ID', '1');.*|define('MOODLE_CATEGORY_ID', '${rendering_rendermoodle_category_id}');|" "${scormConfFile}"
+
+  sed -i "s|define('MOODLE_TIMEOUT', .*|define('MOODLE_TIMEOUT', ${rendering_rendermoodle_timeout});|" "${scormConfFile}"
+  grep -q "define('MOODLE_TIMEOUT'" "${scormConfFile}" || echo "define('MOODLE_TIMEOUT', ${rendering_rendermoodle_timeout});" >> "${scormConfFile}"
+
+
   echo "configured rendering moodle at url ${rendering_rendermoodle_url}"
 else
   echo "disabled rendering moodle"
@@ -252,9 +281,14 @@ sed -i -r 's|\$dbuser.*|\$dbuser = "'"${rendering_database_user}"'";|' "${dbConf
 sed -i -r 's|\$pwd.*|\$pwd = "'"${rendering_database_pass}"'";|' "${dbConf}"
 
 systemConf="${RS_ROOT}/conf/system.conf.php"
-sed -i -r 's|\$MC_URL = ['"'"'"].*|\$MC_URL = "'"${my_base_external}"'";|' "${systemConf}"
+sed -i -r 's|\$MC_URL = ['"'"'"].*|\$MC_URL = '"'${my_external_url}'"';|' "${systemConf}"
 sed -i -r 's|\$MC_DOCROOT.*|\$MC_DOCROOT = "'"${RS_ROOT}"'";|' "${systemConf}"
 sed -i -r 's|\$CC_RENDER_PATH.*|\$CC_RENDER_PATH = "'"${RS_CACHE}/data"'";|' "${systemConf}"
+sed -i -r 's|\$CUSTOM_CONTENT_URL =.*|\$CUSTOM_CONTENT_URL = '"'${rendering_service_custom_content_url}'"';|' "${systemConf}"
+grep -q '$CUSTOM_CONTENT_URL' "${systemConf}" || echo '$CUSTOM_CONTENT_URL = '"'${rendering_service_custom_content_url}'"';' >> "${systemConf}"
+
+
+
 
 [[ -n $my_gdpr_modules ]] && my_gdpr_modules="'${my_gdpr_modules//,/','}'"
 sed -i -r 's|\$DATAPROTECTIONREGULATION_CONFIG.*|\$DATAPROTECTIONREGULATION_CONFIG = ["enabled" => '"${my_gdpr_enabled}"', "modules" => ['"${my_gdpr_modules}"'], "urls" => ['"${my_gdpr_urls}"']];|' "${systemConf}"
@@ -299,6 +333,7 @@ if [[ -n $my_plugins ]] ; then
 fi
 
 homeApp="${RS_ROOT}/conf/esmain/homeApplication.properties.xml"
+
 xmlstarlet ed -L \
 	-u '/properties/entry[@key="scheme"]' -v "${my_prot_internal}" \
 	-u '/properties/entry[@key="host"]' -v "${my_host_internal}" \
@@ -318,6 +353,11 @@ sed -i 's|const VIDEO_FORMATS.*|const VIDEO_FORMATS = ['"${rendering_video_forma
 sed -i 's|const VIDEO_RESOLUTIONS.*|const VIDEO_RESOLUTIONS = ['"${rendering_video_resolutions}"'];|' "${videoConfFile}"
 sed -i 's|const VIDEO_DEFAULT_RESOLUTION.*|const VIDEO_DEFAULT_RESOLUTION = '\""${rendering_video_default_resolution}"\"';|' "${videoConfFile}"
 
+sed -i "s|define('FFMPEG_EXEC_TIMEOUT', .*|define('FFMPEG_EXEC_TIMEOUT', '${rendering_video_timeout}');|" "${videoConfFile}"
+grep -q "define('FFMPEG_EXEC_TIMEOUT'" "${videoConfFile}" || echo "define('FFMPEG_EXEC_TIMEOUT', ${rendering_video_timeout});" >> "${videoConfFile}"
+
+sed -i "s|define('FFMPEG_THREADS', .*|define('FFMPEG_THREADS', ${rendering_video_threads});|" "${videoConfFile}"
+grep -q "define('FFMPEG_THREADS'" "${videoConfFile}" || echo "define('FFMPEG_THREADS', ${rendering_video_threads});" >> "${videoConfFile}"
 
 ########################################################################################################################
 
diff --git a/deploy/docker/services/rendering/compose/src/main/compose/1_rendering-common.yml b/deploy/docker/services/rendering/compose/src/main/compose/1_rendering-common.yml
index 63d4c364..4b33b818 100644
--- a/deploy/docker/services/rendering/compose/src/main/compose/1_rendering-common.yml
+++ b/deploy/docker/services/rendering/compose/src/main/compose/1_rendering-common.yml
@@ -40,6 +40,8 @@ services:
       SERVICES_RENDERING_SERVICE_PORT_EXTERNAL: "${SERVICES_RENDERING_SERVICE_PORT:-9100}"
       SERVICES_RENDERING_SERVICE_PATH_EXTERNAL: "${SERVICES_RENDERING_SERVICE_PATH:-/esrender}"
       SERVICES_RENDERING_SERVICE_PORT_INTERNAL: "8080"
+      SERVICES_RENDERING_SERVICE_DYNAMIC_URL: "${SERVICES_RENDERING_SERVICE_DYNAMIC_URL:-false}"
+      SERVICES_RENDERING_SERVICE_CUSTOM_CONTENT_URL: "${SERVICES_RENDERING_SERVICE_CUSTOM_CONTENT_URL:-}"
       SERVICES_RENDERING_SERVICE_PROXY_NONPROXYHOSTS: "${NON_PROXY_HOST:-}"
       SERVICES_RENDERING_SERVICE_PROXY_HOST: "${PROXY_HOST:-}"
       SERVICES_RENDERING_SERVICE_PROXY_PORT: "${PROXY_PORT:-}"
@@ -49,10 +51,13 @@ services:
       SERVICES_RENDERING_RENDERMOODLE_URL: "${SERVICES_RENDERING_RENDERMOODLE_URL:-}"
       SERVICES_RENDERING_RENDERMOODLE_TOKEN: "${SERVICES_RENDERING_RENDERMOODLE_TOKEN:-}"
       SERVICES_RENDERING_RENDERMOODLE_CATEGORY_ID: "${SERVICES_RENDERING_RENDERMOODLE_CATEGORY_ID:-1}"
+      SERVICES_RENDERING_RENDERMOODLE_TIMEOUT: "${SERVICES_RENDERING_RENDERMOODLE_TIMEOUT:-90}"
       SERVICES_RENDERING_AUDIO_FORMATS: "${SERVICES_RENDERING_AUDIO_FORMATS:-mp3}"
       SERVICES_RENDERING_VIDEO_FORMATS: "${SERVICES_RENDERING_VIDEO_FORMATS:-mp4,webm}"
       SERVICES_RENDERING_VIDEO_RESOLUTIONS: "${SERVICES_RENDERING_VIDEO_RESOLUTIONS:-240,720,1080}"
       SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION: "${SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION:-720}"
+      SERVICES_RENDERING_VIDEO_TIMEOUT: "${SERVICES_RENDERING_VIDEO_TIMEOUT:-3600}"
+      SERVICES_RENDERING_VIDEO_THREADS: "${SERVICES_RENDERING_VIDEO_THREADS:-1}"
       REPOSITORY_SERVICE_HOST: repository-service
       REPOSITORY_SERVICE_PORT: "8080"
     expose:
diff --git a/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-file.yaml b/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-file.yaml
index bb34facf..897ac4e5 100644
--- a/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-file.yaml
+++ b/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-file.yaml
@@ -41,6 +41,10 @@ data:
         return (synth(200, "OK"));
       }
 
+      if (req.method == "POST" || req.method == "PUT" || req.method == "DELETE") {
+        return (pass);
+      }
+
       if (req.restarts > 0) {
         set req.hash_always_miss = true;
       }
diff --git a/repository/webapp/src/main/webapp/META-INF/context.xml b/repository/webapp/src/main/webapp/META-INF/context.xml
index 53b8729f..c3bd604f 100644
--- a/repository/webapp/src/main/webapp/META-INF/context.xml
+++ b/repository/webapp/src/main/webapp/META-INF/context.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context useHttpOnly="false" antiResourceLocking="true">
+<Context useHttpOnly="false" antiResourceLocking="true" unloadDelay="15000">
 		<Loader loaderClass="org.edu_sharing.alfrescocontext.loader.AlfrescoContextClassLoader"/>
 </Context>
\ No newline at end of file