diff --git a/configuration/default.nix b/configuration/default.nix
index f69ec09..1f7a276 100644
--- a/configuration/default.nix
+++ b/configuration/default.nix
@@ -108,11 +108,14 @@
   services.openssh = {
     enable = true;
     allowSFTP = false;
-    passwordAuthentication = false;
-    permitRootLogin = "no";
     ports = [2222];
     startWhenNeeded = true;
-    gatewayPorts = "yes";
+
+    settings = {
+      GatewayPorts = "yes";
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+    };
   };
 
   security = {
diff --git a/configuration/services/gitea.nix b/configuration/services/gitea.nix
index 1d3308a..c636078 100644
--- a/configuration/services/gitea.nix
+++ b/configuration/services/gitea.nix
@@ -2,18 +2,19 @@
   domain = "gitea.${config.services.nginx.domain}";
 in {
   services.gitea = {
-    inherit domain;
     enable = true;
-
-    httpAddress = "127.0.0.1";
     database.type = "postgres";
 
-    rootUrl = "https://${domain}/";
-
     appName = "Gitea: Git with a cup of tea";
 
     settings = {
-      server.SSH_PORT = 2222;
+      server = {
+        DOMAIN = domain;
+        HTTP_ADDR = "127.0.0.1";
+        ROOT_URL = "https://${domain}/";
+        SSH_PORT = 2222;
+      };
+
       service.DISABLE_REGISTRATION = true;
       session.COOKIE_SECURE = true;
     };
@@ -21,7 +22,8 @@ in {
 
   # Set up SSL
   services.nginx.virtualHosts."${domain}" = let
-    inherit (config.services.gitea) httpAddress httpPort;
+    httpAddress = config.services.gitea.settings.server.HTTP_ADDR;
+    httpPort = config.services.gitea.settings.server.HTTP_PORT;
   in {
     forceSSL = true;
     enableACME = true;
diff --git a/configuration/services/nextcloud.nix b/configuration/services/nextcloud.nix
index c25cfb2..4d81454 100644
--- a/configuration/services/nextcloud.nix
+++ b/configuration/services/nextcloud.nix
@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  nextcloud = pkgs.nextcloud25;
+  nextcloud = pkgs.nextcloud26;
   hostName = "nextcloud.${config.services.nginx.domain}";
 in {
   services.nextcloud = {