diff --git a/Dockerfile b/Dockerfile
index 6327f22eb0f7dae4bda59e37df2fed61377fe096..6e9f793186f94f4627dd94e02032a5dd98a63a1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7"
 ARG USER_MIGRATION_JOB_ID="608716"
 ARG MEMORIES_VERSION="5.1.0"
 
-RUN sed -i 's/25,0,8,2/25,0,8,16/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,8,2/25,0,8,19/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -160,7 +160,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \
     rm user_backend_sql_raw.tar.gz;
 
 # Selfhost theme
-RUN if [ "${IS_SELFHOST}" === "true" ] ; then \
+RUN if [ "$IS_SELFHOST" = true ]; then \
         curl -fsSL -o selfhost-theme-helper.tar.gz \
         "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \
         tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \
@@ -266,6 +266,11 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \
     chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
     rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/
 
+# Remove Selfhost theme
+RUN if [ "$IS_SELFHOST" = false ]; then \
+        rm -rf ${BASE_DIR}/custom_apps/selfhost-theme-helper;\
+    fi
+
 # Seds to fix displayname save regression
 RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js
 RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js