diff --git a/flake.lock b/flake.lock
index 54d113a..412674f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -161,16 +161,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1700392168,
-        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
+        "lastModified": 1700814205,
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -236,16 +236,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701362232,
-        "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=",
+        "lastModified": 1701389149,
+        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d2332963662edffacfddfad59ff4f709dde80ffe",
+        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c171180..350ce52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     # Track channels with commits tested and built by hydra
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";
@@ -9,7 +9,7 @@
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
diff --git a/hosts/flora-6/configuration.nix b/hosts/flora-6/configuration.nix
index dc20845..2c49348 100644
--- a/hosts/flora-6/configuration.nix
+++ b/hosts/flora-6/configuration.nix
@@ -7,15 +7,6 @@
 }: let
   psCfg = config.pub-solar;
 in {
-  imports = [
-    "${flake.inputs.unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix"
-    "${flake.inputs.unstable}/nixos/modules/services/web-servers/caddy/default.nix"
-  ];
-  disabledModules = [
-    "services/continuous-integration/gitea-actions-runner.nix"
-    "services/web-servers/caddy/default.nix"
-  ];
-
   config = {
     # Override nix.conf for more agressive garbage collection
     nix.extraOptions = lib.mkForce ''
diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index 5e21f53..a7729a2 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -30,15 +30,5 @@
       ./apps/matrix/synapse.nix
       ./apps/matrix/irc.nix
       ./apps/nginx-matrix.nix
-
-      # Override with module from nixos-unstable, needs to be added
-      # to disabledModules as well
-      "${flake.inputs.unstable}/nixos/modules/services/misc/gitea.nix"
-      "${flake.inputs.unstable}/nixos/modules/services/web-apps/mastodon.nix"
-    ];
-
-    disabledModules = [
-      "services/misc/gitea.nix"
-      "services/web-apps/mastodon.nix"
     ];
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index c11a2c9..4f7efb8 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,12 +8,6 @@
       overlays = ({ ... }: {
         nixpkgs.overlays = [
           (final: prev: {
-            mastodon = inputs.unstable.legacyPackages.${prev.system}.mastodon;
-            forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo;
-            forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner;
-
-            mediawiki = inputs.unstable.legacyPackages.${prev.system}.mediawiki;
-
             element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; };
           })
         ];