diff --git a/templates/nextcloud-config.yaml b/templates/nextcloud-config.yaml
index c2054c57ebf4451f256bf1667e5b8c6471170274..891b507c65f93cc72f25041516fb814568377710 100644
--- a/templates/nextcloud-config.yaml
+++ b/templates/nextcloud-config.yaml
@@ -26,16 +26,6 @@ data:
         }
       }
     }
-  social-login-config.json: |
-    {
-      "apps": {
-        "sociallogin": {
-          "auto_create_groups": "1",
-          "custom_providers": "{\"custom_oidc\": [{\"name\":\"oas\",\"title\":\"OpenAppStack\",\"authorizeUrl\":\"https:\\\/\\\/{{ .Values.sociallogin.server_name }}\\\/{{ .Values.sociallogin.oauth }}\\\/{{ .Values.sociallogin.auth_endpoint }}\",\"tokenUrl\":\"https:\\\/\\\/{{ .Values.sociallogin.server_name}}\\\/{{ .Values.sociallogin.oauth }}\\\/{{ .Values.sociallogin.token_endpoint }}\",\"userInfoUrl\":\"https:\\\/\\\/{{ .Values.sociallogin.server_name }}\\\/{{ .Values.sociallogin.oauth }}\\\/{{ .Values.sociallogin.userinfo_endpoint }}\",\"logoutUrl\":\"\",\"clientId\":\"{{ .Values.sociallogin.client_id }}\",\"clientSecret\":\"{{ .Values.sociallogin.client_secret | default "" }}\",\"scope\":\"{{ .Values.sociallogin.scope }}\",\"groupsClaim\":\"{{ .Values.sociallogin.groups_claim }}\",\"style\":\"\",\"defaultGroup\":\"\",\"groupMapping\":{\"admin\":\"admin\"}}]}",
-          "update_profile_on_login": "1"
-        }
-      }
-    }
   setup-apps.sh: |
     #!/bin/bash
     set -ev
@@ -44,7 +34,7 @@ data:
     cp /var/local/social-login-config.json /var/www/html/
     occ="/var/www/html/occ"
     # Enable app store so we can run `install` and `enable` commands
-    php occ config:system:set appstoreenabled --type boolean --value true
+    php $occ config:system:set appstoreenabled --type boolean --value true
     {{- range .Values.apps }}
     # -- Begin {{ .name }}
     # Only install {{ .name }} if it's not installed already
@@ -59,9 +49,9 @@ data:
 
     # Config settings from the configmap above
     php $occ config:import /var/local/onlyoffice-config.json
-    php $occ config:import /var/local/social-login-config.json
+    php $occ config:app:set sociallogin custom_providers --value='{{ .Values.sociallogin.custom_oidc | toJson }}'
     # Disable app store again
-    php occ config:system:set appstoreenabled --type boolean --value false
+    php $occ config:system:set appstoreenabled --type boolean --value false
   #
   # All values in config.json are applied by the nextcloud occ command
   #   config:import.
diff --git a/values.yaml b/values.yaml
index 80477b459fa9540350103e8a03d1a4b7ce7c6d94..61fb55f8ac128d4960ddd62c1a74ede44c7c18c3 100644
--- a/values.yaml
+++ b/values.yaml
@@ -175,12 +175,19 @@ rabbitmq:
     erlangCookie: stub
 
 sociallogin:
-  server_name: sso.oas.example.net
-  client_id: nextcloud
-  groups_claim: openappstack_roles
-  oauth: oauth2
-  auth_endpoint: "auth"
-  token_endpoint: "token"
-  userinfo_endpoint: "userinfo"
-  scope: "openid profile email openappstack_roles"
-  # client_secret: "YouReallyNeedToChangeThis"
+  custom_oidc:
+    name: oas
+    title: OpenAppStack
+    # Gets prepended with server_name
+    authorizeUrl: sso.oas.example.net/oauth2/auth
+    tokenUrl: sso.oas.example.net/oauth2/token
+    userInfoUrl: sso.oas.example.net/userinfo
+    logoutUrl: ""
+    clientId: nextcloud
+    # clientSecret: YouReallyNeedToChangeThis
+    scope: "openid profile email openappstack_roles"
+    groupsClaim: "openappstack_roles"
+    style: ""
+    defaultGroup: ""
+    groupMapping:
+      admin: admin