diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix
index 4ebc39f..cf41780 100644
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -3,9 +3,7 @@
   pkgs,
   userName,
   ...
-}: let
-  timeZone = null;
-in {
+}: {
   imports = [
     ../../apps/flatpak.nix
     ../../pwrMgmt
@@ -27,7 +25,7 @@ in {
   hardware.bluetooth.enable = true;
 
   # Set your timezone
-  time.timeZone = timeZone ? "America/Detroit";
+  time.timeZone = "America/Detroit";
 
   # Enable touchpad
   services.libinput.enable = true;
diff --git a/modules/machine/cloud/default.nix b/modules/machine/cloud/default.nix
deleted file mode 100644
index 187a110..0000000
--- a/modules/machine/cloud/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./configuration.nix
-    ./hardware-configuration.nix
-  ];
-}
diff --git a/modules/machine/sephiroth/configuration.nix b/modules/machine/sephiroth/configuration.nix
index 26c7a51..e9c2dae 100644
--- a/modules/machine/sephiroth/configuration.nix
+++ b/modules/machine/sephiroth/configuration.nix
@@ -171,7 +171,6 @@
     enable = true;
     dockerCompat = false;
     extraPackages = with pkgs; [
-      podman-tui
       docker-credential-helpers
       cosign
       crane
diff --git a/modules/machine/sephiroth/default.nix b/modules/machine/sephiroth/default.nix
deleted file mode 100644
index fcb07f3..0000000
--- a/modules/machine/sephiroth/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./apps.nix
-    ./configuration.nix
-  ];
-}
diff --git a/modules/virtualization/podman.nix b/modules/virtualization/podman.nix
index 495c4fd..de34445 100644
--- a/modules/virtualization/podman.nix
+++ b/modules/virtualization/podman.nix
@@ -18,22 +18,23 @@ in {
     };
   };
 
-  config = lib.mkIf cfg.podman.enable {
-    virtualisation.podman = {
-      enable = true;
-      dockerCompat = cfg.podman.dockerCompat;
-      enableOnBoot = true;
-      defaultNetwork.settings.dns_enabled = true;
-    };
-
-    environment.systemPackages =
-      [
-        pkgs.podman-compose
-        pkgs.buildah
-        pkgs.skopeo
-        pkgs.dive
-        pkgs.container-diff
-      ]
-      ++ cfg.podman.extraPackages;
-  };
+  config = lib.mkIf cfg.enable (lib.attrsets.optionalAttrs (config.nixpkgs.hostPlatform.isLinux) {
+      virtualisation.podman = {
+        enable = true;
+        dockerCompat = cfg.dockerCompat;
+        enableOnBoot = true;
+        defaultNetwork.settings.dns_enabled = true;
+      };
+    }
+    // {
+      environment.systemPackages =
+        [
+          pkgs.podman-compose
+          pkgs.buildah
+          pkgs.skopeo
+          pkgs.dive
+          pkgs.container-diff
+        ]
+        ++ cfg.extraPackages;
+    });
 }