diff --git a/config/default.nix b/config/default.nix
index 3e4e2270..3d3792d5 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -207,7 +207,10 @@
 
     hedgedoc.ldap.userGroup = "hedgedoc-users";
 
-    home-assistant.ldap.userGroup = "home-assistant-users";
+    home-assistant.ldap = {
+      adminGroup = "home-assistant-admins";
+      userGroup = "home-assistant-users";
+    };
 
     hydra.ldap = {
       roleMappings = [
diff --git a/hosts/home-assistant/default.nix b/hosts/home-assistant/default.nix
index 128ee1ef..0d865752 100644
--- a/hosts/home-assistant/default.nix
+++ b/hosts/home-assistant/default.nix
@@ -98,10 +98,7 @@ in
         "zha" # Zigbee
       ];
       ldap.enable = true;
-      package = (pkgs.home-assistant.override {
-        extraPackages = ps: with ps; [
-          pyqrcode # for TOTP qrcode
-        ];
+      package = pkgs.home-assistant.override {
         # those tests take a long(er) time and can't be sped up with pytest-xdist
         packageOverrides = _: prev: let
           noTests.doCheck = false;
@@ -109,14 +106,7 @@ in
           aws-sam-translator = prev.aws-sam-translator.overridePythonAttrs (_: noTests);
           moto = prev.moto.overridePythonAttrs (_: noTests);
         };
-      }).overrideAttrs ({ patches ? [ ], ... }: {
-        patches = patches ++ [
-          ../../overlays/home-assistant-local_temperature_calibration.diff
-          ../../overlays/home-assistant-no-cloud.diff
-        ];
-
-        doInstallCheck = false;
-      });
+      };
     };
 
     nginx = {