diff --git a/hosts/challenger/configuration.nix b/hosts/challenger/configuration.nix
index 093505b..79e8bd5 100644
--- a/hosts/challenger/configuration.nix
+++ b/hosts/challenger/configuration.nix
@@ -45,6 +45,8 @@
   virtualisation.docker.enable = true;
   virtualisation.oci-containers.backend = "docker";
 
+  security.polkit.enable = true; # Required for nextcloud
+
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
        "nvidia-x11"
        "nvidia-settings"
diff --git a/hosts/challenger/services/komga.nix b/hosts/challenger/services/komga.nix
index 4426ef9..ec086c4 100644
--- a/hosts/challenger/services/komga.nix
+++ b/hosts/challenger/services/komga.nix
@@ -1,16 +1,18 @@
 { config, lib, pkgs, ... }:
 let
   domain = "komga.home.feal.no";
-  cfg = config.services.komga;
+  port = 5001;
 in {
   services.komga = {
     enable = true;
     stateDir = "/tank/media/komga";
-    port = 5001;
+    settings.server = {
+      inherit port;
+    };
   };
 
   services.nginx.virtualHosts.${domain} = {
-    locations."/".proxyPass = "http://127.0.0.1:${toString cfg.port}";
+    locations."/".proxyPass = "http://127.0.0.1:${toString port}";
 
     extraConfig = ''
       client_max_body_size 512M;
diff --git a/hosts/challenger/services/nextcloud.nix b/hosts/challenger/services/nextcloud.nix
index 7128455..f510638 100644
--- a/hosts/challenger/services/nextcloud.nix
+++ b/hosts/challenger/services/nextcloud.nix
@@ -5,7 +5,7 @@ let
 in {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud30;
+    package = pkgs.nextcloud31;
     inherit hostName;
     home = "/tank/nextcloud";
     https = true;
@@ -46,7 +46,9 @@ in {
       oidc_login_filter_allowed_values = [ "nextcloud-user" ];
       oidc_login_disable_registration = false;
 
-      "memories.exiftool" = "${cfg.home}/store-apps/memories/bin-ext/exiftool-amd64-glibc";
+      "memories.exiftool" = pkgs.writeShellScript "exiftool-perl" ''
+        ${lib.getExe pkgs.perl} ${cfg.home}/store-apps/memories/bin-ext/exiftool/exiftool "$@"
+      '';
       "memories.exiftool_no_local" = false;
       "memories.vod.disable" = false;
       "memories.vod.ffmpeg" = "${lib.getExe pkgs.ffmpeg-headless}";