diff --git a/config/hosts/marisa.nix b/config/hosts/marisa.nix
index 8ca5605e..743fd8f9 100644
--- a/config/hosts/marisa.nix
+++ b/config/hosts/marisa.nix
@@ -6,7 +6,7 @@
     services.nginx
     services.access
     users.kat.server
-  ];
+  ] ++ optional (meta.trusted ? services) trusted.service.website;
 
 
   deploy.tf = {
diff --git a/config/services/keycloak.nix b/config/services/keycloak.nix
index 3f8956eb..533b3607 100644
--- a/config/services/keycloak.nix
+++ b/config/services/keycloak.nix
@@ -3,9 +3,6 @@
 in {
   services.keycloak = {
     enable = builtins.getEnv "CI_PLATFORM" == "impure";
-    package = (pkgs.keycloak.override {
-      jre = pkgs.openjdk11;
-    });
     bindAddress = "127.0.0.1";
     httpPort = "8089";
     httpsPort = "8445";
diff --git a/config/tf b/config/tf
index 4ad31dd6..72a3eef0 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 4ad31dd64b0751320204b3a8e05b1f1d870027e8
+Subproject commit 72a3eef071b64b18fb61d48041f9bc0285a358db
diff --git a/config/trusted b/config/trusted
index bc613f95..4a702098 160000
--- a/config/trusted
+++ b/config/trusted
@@ -1 +1 @@
-Subproject commit bc613f9528ecf35f0bfbd83ab299f88d7c44f4a0
+Subproject commit 4a7020983e7c7d246971edde580b8d3914bd2563
diff --git a/flake.lock b/flake.lock
index 2daa87ed..1bcb32c3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     "arcexprs": {
       "flake": false,
       "locked": {
-        "lastModified": 1637367152,
-        "narHash": "sha256-6M3dJuONcD9INaBxFlx6U/nd057PD8/NlMN1jacsJE0=",
+        "lastModified": 1637628825,
+        "narHash": "sha256-5Bgr5YfJKQ7picN9BTLvANGZUCTEfRA9du6V1fkhOfA=",
         "owner": "arcnmx",
         "repo": "nixexprs",
-        "rev": "2e83baee2826fe6576304a1a70ada5b642abb1a9",
+        "rev": "8a3335348e13918c316cb393523f61e6cd43be9a",
         "type": "github"
       },
       "original": {
diff --git a/overlays/default.nix b/overlays/default.nix
index 5166ef4f..9c3e8952 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -15,6 +15,7 @@ let
     ]);
     config = {
       allowUnfree = true;
+      allowUnsupportedSystem = true;
       permittedInsecurePackages = [
         "ffmpeg-3.4.8"
         "ffmpeg-2.8.17"
diff --git a/trusted/flake.lock b/trusted/flake.lock
index 8dbc1640..218865c3 100644
--- a/trusted/flake.lock
+++ b/trusted/flake.lock
@@ -259,7 +259,10 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixfiles",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1637481586,
@@ -312,7 +315,10 @@
     "nix-dns": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixfiles",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1635273082,
@@ -341,7 +347,10 @@
         "explain-pause-mode": "explain-pause-mode",
         "flake-utils": "flake-utils_3",
         "nix-straight": "nix-straight",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixfiles",
+          "nixpkgs"
+        ],
         "nose": "nose",
         "ob-racket": "ob-racket",
         "org": "org",
@@ -396,7 +405,7 @@
         "katexprs": "katexprs",
         "nix-dns": "nix-dns",
         "nix-doom-emacs": "nix-doom-emacs",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs",
         "nur": "nur",
         "tf-nix": "tf-nix",
         "trusted": [
@@ -404,60 +413,16 @@
         ]
       },
       "locked": {
-        "narHash": "sha256-9GUQrhglle3iQO1BqL3yp8Hkvl/ID51G5cpNDfd+VJM=",
-        "path": "/nix/store/6rbym2i4whsjcxnxcdc7srxym4a27kxa-source",
+        "narHash": "sha256-Ivl7zeruE4IBziVoN45np+79Mqme7APYC+fVgHqjvyg=",
+        "path": "/nix/store/njggqc0knm08q2cmxxn2009ig1gnirgz-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/6rbym2i4whsjcxnxcdc7srxym4a27kxa-source",
+        "path": "/nix/store/njggqc0knm08q2cmxxn2009ig1gnirgz-source",
         "type": "path"
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1637523980,
-        "narHash": "sha256-nBbVQHJtR7a+Ctyo67aGc1lwUsoeMhK9PVTh6pB+aYk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4f871e232b8827b0b1d22bc40bc1b0dfa4473156",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1616989418,
-        "narHash": "sha256-LcOn5wHR/1JwClfY/Ai/b+pSRY+d23QtIPQHwPAyHHI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9d8e05e088ad91b7c62886a2175f38bfa443db2c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1630140382,
-        "narHash": "sha256-ntXepAHFlAEtaYIU5EzckRUODeeMgpu1u2Yug+4LFNc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "08ef0f28e3a41424b92ba1d203de64257a9fca6a",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1637155076,
         "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=",
@@ -659,11 +624,11 @@
     "trusted": {
       "flake": false,
       "locked": {
-        "lastModified": 1637526942,
-        "narHash": "sha256-XzWMFgRPY5sQwUO01kZLRAvfFPekp7jXJIAqNiQ8wxs=",
+        "lastModified": 1637629540,
+        "narHash": "sha256-uWqbVzpZB9PJSyswP+k7cTSdGR5kz0rYBzGzWQxIhco=",
         "ref": "main",
-        "rev": "bc613f9528ecf35f0bfbd83ab299f88d7c44f4a0",
-        "revCount": 87,
+        "rev": "4a7020983e7c7d246971edde580b8d3914bd2563",
+        "revCount": 88,
         "type": "git",
         "url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
       },