diff --git a/nixos/hosts/piaware-rpi4/podman.nix b/nixos/hosts/piaware-rpi4/podman.nix
index 2ecb7205..630f7e73 100644
--- a/nixos/hosts/piaware-rpi4/podman.nix
+++ b/nixos/hosts/piaware-rpi4/podman.nix
@@ -1,7 +1,21 @@
 { lib, pkgs, ... }: {
+
+    # Runtime
+    virtualisation.podman = {
+        enable = true;
+        autoPrune.enable = true;
+        dockerCompat = true;
+        defaultNetwork.settings = {
+        # Required for container networking to be able to use names.
+        dns_enabled = true;
+        };
+    };
+    virtualisation.oci-containers.backend = "podman";
+
+    # Containers
     imports = [ 
         ./podman/piaware.nix
     ];
 
-    environment.systemPackages = with pkgs; [ ctop ];
+    environment.systemPackages = [ pkgs.ctop ];
 }
\ No newline at end of file
diff --git a/nixos/hosts/piaware-rpi4/podman/piaware.nix b/nixos/hosts/piaware-rpi4/podman/piaware.nix
index 5a3d26f8..e5814949 100644
--- a/nixos/hosts/piaware-rpi4/podman/piaware.nix
+++ b/nixos/hosts/piaware-rpi4/podman/piaware.nix
@@ -2,18 +2,6 @@
 { pkgs, lib, ... }:
 
 {
-  # Runtime
-  virtualisation.podman = {
-    enable = true;
-    autoPrune.enable = true;
-    dockerCompat = true;
-    defaultNetwork.settings = {
-      # Required for container networking to be able to use names.
-      dns_enabled = true;
-    };
-  };
-  virtualisation.oci-containers.backend = "podman";
-
   # Containers
   virtualisation.oci-containers.containers."piaware" = {
     image = "ghcr.io/sdr-enthusiasts/docker-piaware:latest";