diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index e795af9..3323de4 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -40,6 +40,7 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
       nixpkgs.system = system;
       networking.hostName = name;
       nixpkgs.overlays = lib.mkAfter [
+        # TODO: Remove when https://git.lix.systems/lix-project/lix/issues/310 is fixed
         (_: prev: {
           nix = prev.nix.overrideAttrs (_: {
             doCheck = false;
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index 529ef84..27e57ec 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -166,6 +166,7 @@
 
   systemd.services."step-ca".after = [ "keycloak.service" ];
 
+  # TODO: Remove when keycloak is update in stable channel
   nixpkgs.config.permittedInsecurePackages = [ "keycloak-23.0.6" ];
 
   security.pki.certificates = [