diff --git a/hosts/default.nix b/hosts/default.nix
index 79ba1f8..99b0ad2 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -163,7 +163,6 @@ in
 
   jupiter = lib.nixosSystem {                                # Desktop profile
     inherit system;
-    #user = "dmz-user";
     specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
     modules = [
       agenix.nixosModules.default
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 1812420..83d5271 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -20,9 +20,9 @@
 { config, pkgs, user, ... }:
 
 {
-  imports =                                                         # For now, if applying to other system, swap files
+  imports =                                                         # For now, if applying to other ssystem, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    (import ../../modules/desktop/virtualisation) ++   # Docker
+    #(import ../../modules/desktop/virtualisation) ++   # Docker
     (import ../../modules/services/nas) ++                       # Server Services
     (import ../../modules/hardware);                                # Hardware devices
 
diff --git a/hosts/jupiter/hardware-configuration.nix b/hosts/jupiter/hardware-configuration.nix
index 7aeaea6..99f275c 100644
--- a/hosts/jupiter/hardware-configuration.nix
+++ b/hosts/jupiter/hardware-configuration.nix
@@ -17,8 +17,8 @@
     [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [  ];
 #  boot.initrd.secrets = {
 #    "/root/NASKeyfile" =
 #        /root/NASKeyfile;
@@ -33,7 +33,7 @@
 #      keyFile = "/root/NASKeyfile";
 #    };
 #  };
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [  ];
   boot.extraModulePackages = [ ];
   boot.tmp.useTmpfs = false;
   boot.tmp.cleanOnBoot = true;
@@ -44,6 +44,7 @@
     interval = "monthly";
     fileSystems = [
       "/"
+      "/mnt/Mars"
 #      "/mnt/Pluto"
     ];
   };
@@ -67,6 +68,13 @@
                           subvolume = {
                               "@" = {};
                               "@home" = {};
+                          };
+                      };
+                  };
+                  volume =  {
+                      "/mnt/snapshots/Mars" = {
+                          snapshot_create = "always";
+                          subvolume = {
                               "@nas" = {};
                           };
                       };
@@ -140,7 +148,7 @@
     };
 
     fileSystems."/mnt/snapshots/Mars" =
-    { device = "/dev/disk/by-label/NIXROOT";
+    { device = "/dev/disk/by-label/Mars";
       fsType = "btrfs";
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
     };
@@ -158,7 +166,7 @@
 #    };
 #
   fileSystems."/mnt/Mars" =
-    { device = "/dev/disk/by-label/NIXROOT";
+    { device = "/dev/disk/by-label/Mars";
       fsType = "btrfs";
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
     };
@@ -181,21 +189,6 @@
   swapDevices = [ { device = "/swap/swapfile"; } ];
   
   networking = {
-    vswitches = {
-        vs0 = {
-            interfaces = {
-                enp1s0 = {  };
-                lo1 = {
-                    type = "internal";
-                };
-                enp1s0iot = {
-                    type = "internal";
-                    vlan = 100;
-                };
-            };
-        };
-    };
-    useDHCP = false;                        # Deprecated
     hostName = "jupiter";
     domain = "home.opel-online.de";
     networkmanager = {
@@ -205,8 +198,8 @@
         "192.168.2.1"
     ];
     interfaces = {
-#      enp0s31f6 = {
-#        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+      enp6s18 = {
+        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
 #        ipv4.addresses = [ {
 #            address = "45.142.114.153";
 #            prefixLength = 24;
@@ -216,15 +209,12 @@
 #            prefixLength = 64;
 #        } ];
 #      };
-      lo1 = {
-        useDHCP = true;
-        macAddress = "68:84:7e:71:a0:e0";
       };
     };
 #    defaultGateway = "45.142.114.1";
     defaultGateway6 = {
       address = "fe80::1";
-      interface = "lo1";
+      interface = "enp6s18";
     };
 #    nameservers = [ "9.9.9.9" "2620:fe::fe" ];
     #firewall = {
@@ -234,14 +224,6 @@
     #};
   };
 
-  systemd.services = {
-    "ovsdb".partOf = [ "network-setup.service" ];
-    "ovs-vswitchd".partOf = [ "network-setup.service" ];
-    "network-addresses-lo1" = {
-        requires = [ "network-setup.service" ];
-    };
-  };
-
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   powerManagement = {
     cpuFreqGovernor = lib.mkDefault "powersave";