diff --git a/hosts/drone/default.nix b/hosts/drone/default.nix
index 638f4a41..ae7efdad 100644
--- a/hosts/drone/default.nix
+++ b/hosts/drone/default.nix
@@ -34,7 +34,7 @@ in
           "DATABASE drone" = "ALL PRIVILEGES";
         };
       }];
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "drone-server" ];
     };
   };
diff --git a/hosts/gitea/default.nix b/hosts/gitea/default.nix
index d6a624e9..ec318c86 100644
--- a/hosts/gitea/default.nix
+++ b/hosts/gitea/default.nix
@@ -1,15 +1,10 @@
-{ config, pkgs, lib, libC, libS, ... }:
+{ config, pkgs, lib, libC, ... }:
 
 {
   c3d2.deployment.server = "server10";
 
   microvm.mem = 4 * 1024;
 
-  environment.systemPackages = with pkgs; [
-    # used to restore database dumps
-    config.services.postgresql.package unzip
-  ];
-
   networking = {
     hostName = "gitea";
     firewall.allowedTCPPorts = [ 2222 ];
@@ -137,7 +132,7 @@
     portunus.addToHosts = true;
 
     postgresql = {
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "gitea" ];
     };
   };
diff --git a/hosts/hedgedoc/default.nix b/hosts/hedgedoc/default.nix
index 3d38bb38..679cf11f 100644
--- a/hosts/hedgedoc/default.nix
+++ b/hosts/hedgedoc/default.nix
@@ -76,7 +76,7 @@
           "DATABASE \"hedgedoc\"" = "ALL PRIVILEGES";
         };
       }];
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "hedgedoc" ];
     };
   };
diff --git a/hosts/jabber/default.nix b/hosts/jabber/default.nix
index f01cb2c0..a3b25149 100644
--- a/hosts/jabber/default.nix
+++ b/hosts/jabber/default.nix
@@ -64,7 +64,7 @@ in
       lt-cred-mech = true;
       extraConfig = with zentralwerk.lib.config.site; ''
         external-ip=${hosts.upstream4.interfaces.up4-pppoe.upstream.staticIpv4Address}/${net.serv.hosts4.jabber}
-  
+
         user=${coturnUser}:${coturnPassword}
       '';
     };
@@ -80,7 +80,7 @@ in
           "DATABASE prosody" = "ALL PRIVILEGES";
         };
       }];
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "prosody" ];
     };
     #TODO: txt records?