diff --git a/Dockerfile b/Dockerfile
index 32cbfdd4ba6c0cb787da20bf927636f0b2b89136..bcd23bba2855f6fbcd8b578a930904999b0e920a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG THEME_VERSION="20.0.11"
 ARG NEWS_VERSION="16.0.0"
 ARG QUOTA_WARN_VERSION="1.9.1"
 ARG NOTES_VERSION="4.1.0"
-ARG CONTACTS_VERSION="4.0.0"
+ARG CONTACTS_VERSION="4.0.1"
 ARG CALENDAR_VERSION="2.3.1"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0"
 ARG EMAIL_RECOVERY_JOB_ID="162557"
@@ -40,7 +40,7 @@ RUN curl -fsSL -o notes.tar.gz \
     rm notes.tar.gz;
 
 RUN curl -fsSL -o contacts.tar.gz \
-    "https://github.com/nextcloud/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \
+    "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \
     tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \
     rm contacts.tar.gz;
 
diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh
index 99c5c935840f52d05c4f34ccecc235984efe0d3a..e69c4babe871c0033845e624ca164269c66f18ec 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -18,6 +18,9 @@ rsync $rsync_options --include "/ecloud_drop_account" --exclude '/*' $SRC_DIR/cu
 
 rsync $rsync_options --include "/eelo/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
 
+# force eelo theme not to be disabled even when there is an upgrade process launched
+sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eelo');/g" $DST_DIR/lib/base.php
+
 /entrypoint.sh "$@"
 
 # force eelo theme to be (re)loaded after an upgrade