diff --git a/nix/sources.json b/nix/sources.json
index 3ca98525..22317aa7 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -80,9 +80,9 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
-        "branch": "master",
+        "branch": "nixos-22.11",
         "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
-        "rev": "fe36e7ae0db34862e5397544c7b01472b0febc3a",
+        "rev": "70a970f5a02b7febec1c3065e10c4155b99ecf86",
         "type": "git"
     },
     "nixos-stable": {
diff --git a/nixos/machines/hera/configuration.nix b/nixos/machines/hera/configuration.nix
index 212a2008..3c44d169 100644
--- a/nixos/machines/hera/configuration.nix
+++ b/nixos/machines/hera/configuration.nix
@@ -14,7 +14,6 @@ in {
     ../../roles/standalone
     ../../roles/server
     ../../roles/git.nix
-    ../../roles/element.nix
     ../../roles/mathechor.de.nix
     ../../roles/monitoring
     ../../roles/blog.nix
@@ -60,7 +59,6 @@ in {
   programs = {
     java.enable = true;
   };
-  nixpkgs.config.android_sdk.accept_license = true;
   systemd.services =
     {
       pg_backup = {
diff --git a/nixos/roles/element.nix b/nixos/roles/element.nix
deleted file mode 100644
index e69c836e..00000000
--- a/nixos/roles/element.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  elementConfig = {
-    default_server_config."m.homeserver" = {
-      server_name = "maralorn.de";
-      base_url = "https://matrix.maralorn.de";
-    };
-    integrations_ui_url = "";
-    integgrations_rest_url = "";
-    integrations_widgets_urls = [];
-    roomDirectory.servers = ["matrix.org" "maralorn.de"];
-    branding.welcomeBackgroundUrl = "https://cloud.maralorn.de/apps/theming/image/background";
-  };
-in {
-  services.nginx = {
-    enable = true;
-    virtualHosts."element.maralorn.de" = {
-      enableACME = true;
-      forceSSL = true;
-      root = pkgs.element-web.override (old: {conf = elementConfig;});
-    };
-  };
-}
diff --git a/nixos/roles/firefox-sync.nix b/nixos/roles/firefox-sync.nix
index 86ee81b7..d533bfba 100644
--- a/nixos/roles/firefox-sync.nix
+++ b/nixos/roles/firefox-sync.nix
@@ -37,7 +37,7 @@ with lib; let
   user = "syncserver";
   group = "syncserver";
 in {
-  disabledModules = ["services/networking/firefox/sync-server.nix"];
+  disabledModules = ["services/networking/firefox-syncserver.nix"];
 
   meta.maintainers = with lib.maintainers; [nadrieril];
 
diff --git a/nixos/roles/monitoring/grafana.nix b/nixos/roles/monitoring/grafana.nix
index eeeea52e..16daa4eb 100644
--- a/nixos/roles/monitoring/grafana.nix
+++ b/nixos/roles/monitoring/grafana.nix
@@ -34,15 +34,15 @@ in {
     grafana = {
       enable = true;
       auth.anonymous.enable = true;
-      extraOptions = {
-        SECURITY_ALLOW_EMBEDDING = "true";
-        USERS_DEFAULT_THEME = "light";
-        AUTH_BASIC_ENABLED = "false";
-        DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH = "${dashboards}/health-status.json";
+      settings = {
+        secrutiy.allow_embedding = "true";
+        users.default_theme = "light";
+        "auth.basic".enabled = "false";
+        dashboards.default_home_dashboard_path = "${dashboards}/health-status.json";
       };
       provision = {
         enable = true;
-        datasources = [
+        datasources.settings.datasources = [
           {
             access = "proxy";
             name = "prometheus";
@@ -50,7 +50,7 @@ in {
             url = "http://localhost:9090";
           }
         ];
-        dashboards = [
+        dashboards.settings.providers = [
           {
             name = "Static dashboards";
             options.path = dashboards;
diff --git a/overlays/20-unfree.nix b/overlays/20-unfree.nix
index dc344d4a..825e5cce 100644
--- a/overlays/20-unfree.nix
+++ b/overlays/20-unfree.nix
@@ -1,7 +1,12 @@
 self: super: let
-  unfree = import self.sources."${self.nixpkgs-channel}" {config.allowUnfree = true;};
+  unfree = import self.sources."${self.nixpkgs-channel}" {
+    config = {
+      allowUnfree = true;
+      android_sdk.accept_license = true;
+    };
+  };
   unstableUnfree = import self.sources.nixos-unstable {config.allowUnfree = true;};
 in {
-  inherit (unfree) discord zoom-us minecraft teamviewer steam;
+  inherit (unfree) discord zoom-us minecraft teamviewer steam androidsdk_9_0;
   inherit (unstableUnfree) minecraft-server;
 }