diff --git a/system/core/default.nix b/system/core/default.nix
index 151cf84f..87a2ac4f 100644
--- a/system/core/default.nix
+++ b/system/core/default.nix
@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ./audio.nix
     ./bluetooth.nix
@@ -15,5 +16,7 @@
     ./syncthing.nix
     ./users.nix
     ./zsh.nix
+
+    ./virtulization.nix
   ];
 }
diff --git a/system/core/env.nix b/system/core/env.nix
index 8b582f61..4224d253 100644
--- a/system/core/env.nix
+++ b/system/core/env.nix
@@ -1,9 +1,12 @@
-{...}: {
+{ ... }:
+{
   time.timeZone = "Europe/Berlin";
 
   environment.variables = {
     EDITOR = "hx";
     VISUAL = "hx";
     FLAKE = "/home/lilith/nixos";
+
+    ELECTRON_OZONE_PLATFORM_HINT = "wayland";
   };
 }
diff --git a/system/core/users.nix b/system/core/users.nix
index cfc00535..b5230a16 100644
--- a/system/core/users.nix
+++ b/system/core/users.nix
@@ -15,8 +15,9 @@ in
       hashedPasswordFile = config.sops.secrets."user/password".path;
     };
 
-    remotebuilder = {
-      isSystemUser = true;
+    nixremote = {
+      isNormalUser = true;
+      createHome = false;
       group = "users";
       extraGroups = [ ];
       openssh.authorizedKeys.keys = [
diff --git a/system/core/virtualization.nix b/system/core/virtualization.nix
new file mode 100644
index 00000000..4b63a5cf
--- /dev/null
+++ b/system/core/virtualization.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  virtualisation.podman = {
+    enable = true;
+    dockerCompat = true;
+  };
+
+  environment.systemPackages = [ pkgs.distrobox ];
+}