diff --git a/containers/home-assistant.nix b/containers/home-assistant.nix
index b0ce772..1a1ee21 100644
--- a/containers/home-assistant.nix
+++ b/containers/home-assistant.nix
@@ -130,11 +130,11 @@
                     ];
                   };
                 package =
-                  (pkgs.home-assistant.override
+                  pkgs.home-assistant.override
                     { extraComponents =
                         [ "http"
                           "homeassistant"
-                          "image"
+                          # "image"
                           "person"
                           "cloud"
                           "onboarding"
@@ -151,14 +151,13 @@
                           "stream"
                           "recorder"
                         ];
-                    }).overridePythonAttrs (old:
-                      {
-                        propagatedBuildInputs = with old.passthru.python.pkgs;
-                          [ xmodem
-                            psycopg2
-                            aiohttp-cors
-                          ] ++ old.propagatedBuildInputs;
-                      });
+
+                      extraPackages = ps: with ps;
+                        [ xmodem
+                          psycopg2
+                          aiohttp-cors
+                        ];
+                    };
               };
             };
           });
diff --git a/flake.lock b/flake.lock
index 026eeb0..0a485db 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,15 +55,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1682262484,
-        "narHash": "sha256-2ep7UAYzvgGQ+uuwDgRqXksDCgqT3dEOCvOgS4hcOMs=",
+        "lastModified": 1682422260,
+        "narHash": "sha256-5yHfygjNdKi2HK06P3psPRcoegkYkaOF81sEwlMdKMc=",
         "owner": "nix-community",
         "repo": "NixNG",
-        "rev": "69019125a41249605fde6fca2acc51933725e848",
+        "rev": "14df8debfbd2a2e8e946848ad24581109a286020",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "hass-fix",
         "repo": "NixNG",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index ef1b106..6675d48 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
 
     nixng = {
-      url = "github:nix-community/NixNG";
+      url = "github:nix-community/NixNG?ref=hass-fix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     website = {