diff --git a/lib/default.nix b/lib/default.nix
index 3bba64ef..3843e6b0 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -32,7 +32,6 @@ let
 
   cfg = config.c3d2;
 
-
 in {
 
   imports = [ ./users ];
@@ -256,8 +255,7 @@ in {
 
     nix = lib.mkIf
       (cfg.hq.enableBinaryCache && config.networking.hostName != "server7") {
-        binaryCaches =
-          [ "http://server7.hq:${toString config.services.nix-serve.port}" ];
+        binaryCaches = [ "https://cache.server7.hq.c3d2.de" ];
         binaryCachePublicKeys = [
           "cache.server7.hq.c3d2.de:x8JLRG26zRZ8ysYZLEkPxuAYuK1VSJi/aMAEIs2Lv+U="
         ];
diff --git a/lib/hq.nix b/lib/hq.nix
index 98edb2f1..4ecc258c 100644
--- a/lib/hq.nix
+++ b/lib/hq.nix
@@ -1,25 +1,7 @@
 { config, lib, ... }:
 
-let
-  notHydra = config.networking.hostName != "hydra";
-  notServer7 = config.networking.hostName != "server7";
-  port = toString config.services.nix-serve.port;
-in {
-
-  nix = {
-    binaryCaches = [ ]
-      ++ (lib.optional notHydra "https://nix-serve.hq.c3d2.de")
-      ++ (lib.optional notServer7 "http://server7.hq.c3d2.de:${port}");
-
-    binaryCachePublicKeys = [
-      "nix-serve.hq.c3d2.de:FEi9GyFkou1Ua8INaEKmuGaww9E5y3XwrNGNRfKYeLo="
-      "server7:PxMuG2KvTibHSqOWi+6bY6fbv2ztjzbSEZHVIna/sRA="
-    ];
-  };
-
+{
   # Please import only things that are configurable and OFF BY DEFAULT!
-  imports = [
-    ./yggdrasil-hq.nix
-  ];
+  imports = [ ./yggdrasil-hq.nix ];
 
 }