diff --git a/modules/gitea.nix b/modules/gitea.nix
index 3f0140c..2e23e39 100644
--- a/modules/gitea.nix
+++ b/modules/gitea.nix
@@ -26,7 +26,7 @@ in {
       forceSSL = true;
       useACMEHost = root_host;
       locations."/" = {
-        proxyPass = "http://127.0.0.1:${builtins.toString gitea_port}";
+        proxyPass = "http://127.0.0.1:${builtins.toString config.services.gitea.settings.server.HTTP_PORT}";
       };
     };
   };
diff --git a/modules/puffer.nix b/modules/puffer.nix
index 6723127..131da82 100644
--- a/modules/puffer.nix
+++ b/modules/puffer.nix
@@ -11,8 +11,8 @@ in {
       PUFFER_WEB_HOST = ":${builtins.toString puffer_port}";
       PUFFER_DAEMON_SFTP_HOST = ":${builtins.toString puffer_sftp_port}";
     };
-    extraPackages = with pkgs; [ jdk17_headless ];
-    extraGroups = [ "podman" "docker" ];
+    extraPackages = with pkgs; [];
+    extraGroups = [ "docker" ];
   };
 
   services.nginx = {
@@ -29,7 +29,7 @@ in {
   security.acme.certs."${root_host}".extraDomainNames = [ puffer_host ];
   networking.firewall.allowedTCPPorts = [ puffer_sftp_port 25565 ];
 
-  virtualisation.podman.enable = true;
+#  virtualisation.podman.enable = true;
   virtualisation.docker.enable = true;
 
 }