diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix
index 34cb390..f070dd4 100644
--- a/systems/i686-linux/Rubtrm/default.nix
+++ b/systems/i686-linux/Rubtrm/default.nix
@@ -11,6 +11,11 @@
   ];
 
   # Configure Nix
+  #nix.package = pkgs.lixPackageSets.stable.lix;
+  nix.extraOptions = ''
+    secret-key-files = /root/secrets/cache-Rubtrm.sec
+    builders-use-substitutes = true
+  '';
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
     substituters = [ 
@@ -18,19 +23,32 @@
     ];
     trusted-public-keys = [
       "cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g="
+      "cache-LoyAdjo:kZM9GP0q/DG9U8IvX+rGuHgUdiwKLcwwUw4KPM2kA7c="
     ];
     trusted-users = [ "kb" ];
   };
   nixpkgs.config.allowUnsupportedSystem = true;
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.packageOverrides = pkgs: {
-    xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
-      configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
-    });
-    #w3m = pkgs.w3m.overrideAttrs (old: {
-    #  libX11 = old.libx11;
-    #});
-  };
+#  nixpkgs.config.packageOverrides = pkgs: {
+#    xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
+#      configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
+#    });
+#    #w3m = pkgs.w3m.overrideAttrs (old: {
+#    #  libX11 = old.libx11;
+#    #});
+#  };
+  nix.buildMachines = [
+    {
+      hostName = "kb-senfnvp-remotebuild";
+      systems = [ "aarch64-linux" ];
+      protocol = "ssh-ng";
+      maxJobs = 10;
+      speedFactor = 2;
+      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ];
+      mandatoryFeatures = [];
+    }
+  ];
+  nix.distributedBuilds = true;
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
@@ -55,13 +73,13 @@
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
   # Enable Desktop Environment.
-  #services.displayManager.sddm = {
-  #  #package = pkgs.kdePackages.sddm;
-  #  theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
-  #};
+  services.displayManager.sddm = {
+    #package = pkgs.kdePackages.sddm;
+    theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
+  };
   #services.displayManager.sddm.enable = true;
   # services.displayManager.sddm.wayland.enable = true;
-  # services.xserver.displayManager.lightdm.enable = true;
+  #services.xserver.displayManager.lightdm.enable = true;
   # services.xserver.desktopManager.plasma5.enable = true;
   #services.xserver.desktopManager.xfce.enable = true;
   # services.xserver.desktopManager.lxqt.enable = true;
@@ -118,6 +136,9 @@
     pkgs.where-is-my-sddm-theme
   ];
 
+  # Enable SSH-Agent
+  programs.ssh.startAgent = true;
+
   # SSH and Mosh
   services.openssh = {
     enable = true;
diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix
index 052bc18..ae21565 100644
--- a/systems/i686-linux/Rubtrm/hardware.nix
+++ b/systems/i686-linux/Rubtrm/hardware.nix
@@ -13,7 +13,7 @@
   boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "i915.force_probe=27ae" ];
+  boot.kernelParams = [ "i915.force_probe=27a6" ];
 
 
   # Boot Process
@@ -54,8 +54,9 @@
   # libva-vdpau-drivemesar
   # libvdpau-va-gl
   # mesa
-  hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
-  hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
+  # Test Device 2
+  #hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
+  #hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableAllFirmware = true;
 }