diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
index 400752e..09ea20e 100644
--- a/modules/hardware/nvidia.nix
+++ b/modules/hardware/nvidia.nix
@@ -76,15 +76,15 @@ in {
         # accessible via `nvidia-settings`.
         nvidiaSettings = true;
         # Optionally, you may need to select the appropriate driver version for your specific GPU.
-        #package = config.boot.kernelPackages.nvidiaPackages.beta;
-        package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-          version = "570.124.04";
-          sha256_64bit = "sha256-G3hqS3Ei18QhbFiuQAdoik93jBlsFI2RkWOBXuENU8Q=";
-          sha256_aarch64 = "";
-          openSha256 = "";
-          settingsSha256 = "sha256-LNL0J/sYHD8vagkV1w8tb52gMtzj/F0QmJTV1cMaso8=";
-          persistencedSha256 = "";
-        };
+        package = config.boot.kernelPackages.nvidiaPackages.beta;
+          #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+          #  version = "570.124.04";
+          #  sha256_64bit = "sha256-G3hqS3Ei18QhbFiuQAdoik93jBlsFI2RkWOBXuENU8Q=";
+          #  sha256_aarch64 = "";
+          #  openSha256 = "";
+          #  settingsSha256 = "sha256-LNL0J/sYHD8vagkV1w8tb52gMtzj/F0QmJTV1cMaso8=";
+          #  persistencedSha256 = "";
+          #};
       };
 
       environment.systemPackages = with pkgs; [
diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix
index 795d54e..4844a80 100644
--- a/systems/amd-server/configuration.nix
+++ b/systems/amd-server/configuration.nix
@@ -24,7 +24,8 @@
       settings.enable = true;
     };
     hardware = {
-      amd-gpu.enable = true;
+      #amd-gpu.enable = true;
+      nvidia.enable = true;
       firmware.enable = true;
       ssd.enable = true;
       wooting.enable = true;
@@ -59,7 +60,7 @@
     defaultGateway.address = "192.168.0.1";
     nameservers = [ "192.168.0.10" "1.1.1.1" ];
 
-    bridges.br0 = { interfaces = [ "enp0s31f6" ]; };
+    bridges.br0 = { interfaces = [ "enp42s0" ]; };
     interfaces.br0 = {
       ipv4.addresses = [{
         address = "192.168.0.20";
diff --git a/systems/amd-server/hardware-configuration-bak.nix b/systems/amd-server/hardware-configuration-intel.nix
similarity index 85%
rename from systems/amd-server/hardware-configuration-bak.nix
rename to systems/amd-server/hardware-configuration-intel.nix
index 08bee7c..01e98fd 100644
--- a/systems/amd-server/hardware-configuration-bak.nix
+++ b/systems/amd-server/hardware-configuration-intel.nix
@@ -6,10 +6,9 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "uas" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
@@ -33,6 +32,7 @@
   # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.cpu.amd.updateMicrocode =
     lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/systems/amd-server/hardware-configuration.nix b/systems/amd-server/hardware-configuration.nix
index 01e98fd..08bee7c 100644
--- a/systems/amd-server/hardware-configuration.nix
+++ b/systems/amd-server/hardware-configuration.nix
@@ -6,9 +6,10 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "uas" "sd_mod" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
@@ -32,7 +33,6 @@
   # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.cpu.amd.updateMicrocode =
     lib.mkDefault config.hardware.enableRedistributableFirmware;
 }