diff --git a/hosts/nixos/home/partials/apps.nix b/hosts/nixos/home/partials/apps.nix
deleted file mode 100644
index 51a1757..0000000
--- a/hosts/nixos/home/partials/apps.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    pods
-    zed-editor
-  ];
-}
diff --git a/hosts/nixos/system/os.nix b/hosts/nixos/system/os.nix
index f042af1..73db16a 100755
--- a/hosts/nixos/system/os.nix
+++ b/hosts/nixos/system/os.nix
@@ -17,16 +17,19 @@
   # System configurations
   os.keyboard.apple.enable = true;
 
+  # Flatpak configuration
+  os.flatpak.enable = true;
+
   # Virtualisation Apps
   os.virtualisation.cuda.enable = true;
   os.virtualisation.podman.enable = true;
 
-  # Terminal
-  programs.ssh.enableAskPassword = false; # No-window git push fix
-
   # Shells configurations
   os.shells.gnome.enable = true;
 
+  # Terminal
+  programs.ssh.enableAskPassword = false; # No-window git push fix
+
   # System version
   system.stateVersion = "25.11";
 }
diff --git a/hosts/nixos/system/partials/apps.nix b/hosts/nixos/system/partials/apps.nix
index 5fb51b7..9491d06 100644
--- a/hosts/nixos/system/partials/apps.nix
+++ b/hosts/nixos/system/partials/apps.nix
@@ -1,7 +1,10 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  os.flatpak.enable = true;
   services.flatpak.packages = [
     "io.github.flattool.Warehouse"
   ];
+
+  environment.systemPackages = with pkgs; [
+    zed-editor
+  ];
 }
diff --git a/hosts/nixos/system/partials/podman.nix b/hosts/nixos/system/partials/podman.nix
new file mode 100644
index 0000000..49253db
--- /dev/null
+++ b/hosts/nixos/system/partials/podman.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    pods
+  ];
+}