diff --git a/system/configuration.nix b/system/configuration.nix
index 9502620..37f5fed 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -10,7 +10,7 @@
       ./hardware-configuration.nix
       ../secrets/networking-configuration.nix
       ./packaging-configuration.nix
-      ./containerd.nix
+      ./containerd/containerd.nix
     ];
 
   # Prepare nix flakes
@@ -146,7 +146,7 @@
     gtk_engines
     gsettings-desktop-schemas
     lxappearance
-  ];
+  ] ++ (import ./containerd/systemPackages.nix pkgs).systemPackages;
 
 #  environment.systemPackages = [
 #    import /scripts/jetbrains.rider.nix
diff --git a/system/containerd.nix b/system/containerd/containerd.nix
similarity index 70%
rename from system/containerd.nix
rename to system/containerd/containerd.nix
index 8d00479..9914a70 100644
--- a/system/containerd.nix
+++ b/system/containerd/containerd.nix
@@ -7,9 +7,4 @@
 #      uid = 1000;
 #    };
   };
-
-  environment.systemPackages = with pkgs; [
-    cni
-    cni-plugins
-  ];
 }
diff --git a/system/containerd/systemPackages.nix b/system/containerd/systemPackages.nix
new file mode 100644
index 0000000..36a6701
--- /dev/null
+++ b/system/containerd/systemPackages.nix
@@ -0,0 +1,6 @@
+{ pkgs }: {
+  systemPackages = with pkgs; [
+    cni
+    cni-plugins
+  ];
+}