diff --git a/gerrit/Dockerfile.entrypoint-unprivileged b/gerrit/Dockerfile.entrypoint-unprivileged
index 5af70c9..b9951b8 100644
--- a/gerrit/Dockerfile.entrypoint-unprivileged
+++ b/gerrit/Dockerfile.entrypoint-unprivileged
@@ -2,6 +2,12 @@
 
 set -e
 
+{
+    git config -f /var/gerrit/etc/gerrit.config --unset-all auth.trustedOpenID || true
+    git config -f /var/gerrit/etc/gerrit.config --add auth.trustedOpenID https://
+    git config -f /var/gerrit/etc/gerrit.config --add auth.trustedOpenID imported:
+}
+
 if [ "${GITHUB_OAUTH_CLIENT_ID}" -a "${GITHUB_OAUTH_CLIENT_SECRET}" ]; then
     git config -f /var/gerrit/etc/gerrit.config \
         plugin.gerrit-oauth-provider-github-oauth.root-url "https://github.com/"
@@ -9,6 +15,7 @@
         plugin.gerrit-oauth-provider-github-oauth.client-id "${GITHUB_OAUTH_CLIENT_ID}"
     git config -f /var/gerrit/etc/gerrit.config \
         plugin.gerrit-oauth-provider-github-oauth.client-secret "${GITHUB_OAUTH_CLIENT_SECRET}"
+    git config -f /var/gerrit/etc/gerrit.config --add auth.trustedOpenID github-oauth:
 fi
 
 secret=/var/gerrit/passwd/secret