diff --git a/demo/nextcloud/flake.nix b/demo/nextcloud/flake.nix
index d9d68c9..ffd8be6 100644
--- a/demo/nextcloud/flake.nix
+++ b/demo/nextcloud/flake.nix
@@ -20,6 +20,7 @@
           subdomain = "n";
           dataDir = "/var/lib/nextcloud";
           tracing = null;
+          defaultPhoneRegion = "US";
 
           # This option is only needed because we do not access Nextcloud at the default port in the VM.
           port = 8080;
diff --git a/modules/services/nextcloud-server.nix b/modules/services/nextcloud-server.nix
index 8e4beb2..525e470 100644
--- a/modules/services/nextcloud-server.nix
+++ b/modules/services/nextcloud-server.nix
@@ -103,6 +103,14 @@ in
       '';
     };
 
+    defaultPhoneRegion = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        Two letters region defining default region.
+      '';
+      example = "US";
+    };
+
     postgresSettings = lib.mkOption {
       type = lib.types.nullOr (lib.types.attrsOf lib.types.str);
       default = null;
@@ -479,8 +487,8 @@ in
           adminuser = cfg.adminUser;
           adminpassFile = toString cfg.adminPassFile;
           # Not using dbpassFile as we're using socket authentication.
-          defaultPhoneRegion = "US";
-          trustedProxies = [ "127.0.0.1" ];
+          default_phone_region = cfg.defaultPhoneRegion;
+          trusted_proxies = [ "127.0.0.1" ];
         };
         database.createLocally = true;
 
@@ -500,7 +508,7 @@ in
         extraAppsEnable = true;
         appstoreEnable = true;
 
-        extraOptions = let
+        settings = let
           protocol = if !(isNull cfg.ssl) then "https" else "http";
         in {
           "overwrite.cli.url" = "${protocol}://${fqdn}";
@@ -765,7 +773,7 @@ in
         secretFile = "${cfg.dataDir}/config/secretFile";
 
         # See all options at https://github.com/pulsejet/nextcloud-oidc-login
-        extraOptions = {
+        settings = {
           allow_user_to_change_display_name = false;
           lost_password_link = "disabled";
           oidc_login_provider_url = ssoFqdnWithPort;