diff --git a/flake.nix b/flake.nix
index ee1d64a..48bdb7e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -229,38 +229,38 @@
           };
       };
 
-      freyaConfig = {
-        nixosConfigurations = rec {
-          freya = nixpkgs.lib.nixosSystem rec {
-            system = "aarch64-linux";
-            modules =
-              commonModules
-              ++ [
-                nixos-hardware.nixosModules.raspberry-pi."4"
-                ./freya/hardware-configuration.nix
-                ./freya/configuration.nix
-                { home-manager.users.bertof = import ./freya/hm.nix; }
-              ];
-          };
-        };
-      };
+      # freyaConfig = {
+      #   nixosConfigurations = rec {
+      #     freya = nixpkgs.lib.nixosSystem rec {
+      #       system = "aarch64-linux";
+      #       modules =
+      #         commonModules
+      #         ++ [
+      #           nixos-hardware.nixosModules.raspberry-pi-4
+      #           ./freya/hardware-configuration.nix
+      #           ./freya/configuration.nix
+      #           { home-manager.users.bertof = import ./freya/hm.nix; }
+      #         ];
+      #     };
+      #   };
+      # };
 
-      baldurConfig = {
-        nixosConfigurations = rec {
-          baldur = nixpkgs.lib.nixosSystem rec {
-            system = "x86_64-linux";
-            modules =
-              commonModules
-              ++ [
-                # nixos-hardware.nixosModules.common-cpu-amd
-                # nixos-hardware.nixosModules.common-pc-ssd
-                ./baldur/hardware-configuration.nix
-                ./baldur/configuration.nix
-                { home-manager.users.bertof = import ./baldur/hm.nix; }
-              ];
-          };
-        };
-      };
+      # baldurConfig = {
+      #   nixosConfigurations = rec {
+      #     baldur = nixpkgs.lib.nixosSystem rec {
+      #       system = "x86_64-linux";
+      #       modules =
+      #         commonModules
+      #         ++ [
+      #           # nixos-hardware.nixosModules.common-cpu-amd
+      #           # nixos-hardware.nixosModules.common-pc-ssd
+      #           ./baldur/hardware-configuration.nix
+      #           ./baldur/configuration.nix
+      #           { home-manager.users.bertof = import ./baldur/hm.nix; }
+      #         ];
+      #     };
+      #   };
+      # };
 
       lokiConfig = {
         nixosConfigurations = rec {
@@ -278,13 +278,31 @@
           };
         };
       };
+
+      deployments = {
+        # Deploy-rs checks
+        checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+
+        # Map nodes to Deploy-rs deployments
+        deploy.nodes = {
+          loki = {
+            hostname = "loki.local";
+            profiles.system = {
+              user = "root";
+              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki;
+            };
+          };
+        };
+      };
+
     in
     builtins.foldl' nixpkgs.lib.recursiveUpdate { } [
       basic
       thorConfig
       odinConfig
-      freyaConfig
-      baldurConfig
+      # freyaConfig
+      # baldurConfig
       lokiConfig
+      deployments
     ];
 }