diff --git a/gerrit/Dockerfile.entrypoint-unprivileged b/gerrit/Dockerfile.entrypoint-unprivileged
index b768dbc..9976ae5 100644
--- a/gerrit/Dockerfile.entrypoint-unprivileged
+++ b/gerrit/Dockerfile.entrypoint-unprivileged
@@ -6,8 +6,8 @@
 
 {
     git config -f ${config} --unset-all auth.trustedOpenID || true
-    git config -f ${config} --add auth.trustedOpenID https://
-    git config -f ${config} --add auth.trustedOpenID imported:
+    git config -f ${config} auth.gitBasicAuthPolicy HTTP
+    git config -f ${config} auth.type OAUTH
 }
 
 if [ "${GITHUB_OAUTH_CLIENT_ID}" -a "${GITHUB_OAUTH_CLIENT_SECRET}" ]; then
@@ -17,7 +17,6 @@
         plugin.gerrit-oauth-provider-github-oauth.client-id "${GITHUB_OAUTH_CLIENT_ID}"
     git config -f ${config} \
         plugin.gerrit-oauth-provider-github-oauth.client-secret "${GITHUB_OAUTH_CLIENT_SECRET}"
-    git config -f ${config} --add auth.trustedOpenID github-oauth:
 fi
 
 if [ "${GERRIT_USER_EMAIL}" -a "${GERRIT_MAIL_PASSWORD}" ]; then
@@ -38,7 +37,6 @@
     git config -f ${config} ${kc_oauth}.client-id gerrit
     git config -f ${config} ${kc_oauth}.client-secret ${GERRIT_KC_PASSWORD}
     git config -f ${config} ${kc_oauth}.use-preferred-username true
-    git config -f ${config} --add auth.trustedOpenID keycloak-oauth:
 fi
 
 exec /entrypoint.sh "$@"