diff --git a/templates/targets/aarch64/nvidia/orin-agx/flake.nix b/templates/targets/aarch64/nvidia/orin-agx/flake.nix
index 081a11f49..1b5b41fef 100644
--- a/templates/targets/aarch64/nvidia/orin-agx/flake.nix
+++ b/templates/targets/aarch64/nvidia/orin-agx/flake.nix
@@ -52,13 +52,15 @@
 
       {
         nixosConfigurations.PROJ_NAME-ghaf-debug = ghaf.nixosConfigurations.nvidia-jetson-orin-agx-debug.extendModules {
-          modules = [
-            {
-              #insert your additional modules here e.g.
-              # virtualisation.docker.enable = true;
-              # users.users."ghaf".extraGroups = ["docker"];
-            }
-          ];
+          modules =
+            [
+              {
+                #insert your additional modules here e.g.
+                # virtualisation.docker.enable = true;
+                # users.users."ghaf".extraGroups = ["docker"];
+              }
+            ]
+            ++ (import ./modules/modules-list.nix);
         };
         packages.aarch64-linux.PROJ_NAME-ghaf-debug = self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.system.build.${self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.formatAttr};
 
diff --git a/templates/targets/aarch64/nvidia/orin-agx/modules/modules-list.nix b/templates/targets/aarch64/nvidia/orin-agx/modules/modules-list.nix
new file mode 100644
index 000000000..0de0bf49d
--- /dev/null
+++ b/templates/targets/aarch64/nvidia/orin-agx/modules/modules-list.nix
@@ -0,0 +1,7 @@
+# Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+[
+  # Your modules.nx files go here
+]
diff --git a/templates/targets/aarch64/nvidia/orin-agx/packages/.gitkeep b/templates/targets/aarch64/nvidia/orin-agx/packages/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/targets/aarch64/nvidia/orin-nx/flake.nix b/templates/targets/aarch64/nvidia/orin-nx/flake.nix
index 83cb4b34a..35ad4c417 100644
--- a/templates/targets/aarch64/nvidia/orin-nx/flake.nix
+++ b/templates/targets/aarch64/nvidia/orin-nx/flake.nix
@@ -52,13 +52,15 @@
 
       {
         nixosConfigurations.PROJ_NAME-ghaf-debug = ghaf.nixosConfigurations.nvidia-jetson-orin-nx-debug.extendModules {
-          modules = [
-            {
-              #insert your additional modules here e.g.
-              # virtualisation.docker.enable = true;
-              # users.users."ghaf".extraGroups = ["docker"];
-            }
-          ];
+          modules =
+            [
+              {
+                #insert your additional modules here e.g.
+                # virtualisation.docker.enable = true;
+                # users.users."ghaf".extraGroups = ["docker"];
+              }
+            ]
+            ++ (import ./modules/modules-list.nix);
         };
         packages.aarch64-linux.PROJ_NAME-ghaf-debug = self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.system.build.${self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.formatAttr};
 
diff --git a/templates/targets/aarch64/nvidia/orin-nx/modules/modules-list.nix b/templates/targets/aarch64/nvidia/orin-nx/modules/modules-list.nix
new file mode 100644
index 000000000..0de0bf49d
--- /dev/null
+++ b/templates/targets/aarch64/nvidia/orin-nx/modules/modules-list.nix
@@ -0,0 +1,7 @@
+# Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+[
+  # Your modules.nx files go here
+]
diff --git a/templates/targets/aarch64/nvidia/orin-nx/packages/.gitkeep b/templates/targets/aarch64/nvidia/orin-nx/packages/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/targets/aarch64/nxp/imx8/flake.nix b/templates/targets/aarch64/nxp/imx8/flake.nix
index fb454d96e..5412d6570 100644
--- a/templates/targets/aarch64/nxp/imx8/flake.nix
+++ b/templates/targets/aarch64/nxp/imx8/flake.nix
@@ -48,13 +48,15 @@
 
       {
         nixosConfigurations.PROJ_NAME-ghaf-debug = ghaf.nixosConfigurations.imx8qm-mek-debug.extendModules {
-          modules = [
-            {
-              #insert your additional modules here e.g.
-              # virtualisation.docker.enable = true;
-              # users.users."ghaf".extraGroups = ["docker"];
-            }
-          ];
+          modules =
+            [
+              {
+                #insert your additional modules here e.g.
+                # virtualisation.docker.enable = true;
+                # users.users."ghaf".extraGroups = ["docker"];
+              }
+            ]
+            ++ (import ./modules/modules-list.nix);
         };
         packages.aarch64-linux.PROJ_NAME-ghaf-debug = self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.system.build.${self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.formatAttr};
       }
diff --git a/templates/targets/aarch64/nxp/imx8/modules/modules-list.nix b/templates/targets/aarch64/nxp/imx8/modules/modules-list.nix
new file mode 100644
index 000000000..0de0bf49d
--- /dev/null
+++ b/templates/targets/aarch64/nxp/imx8/modules/modules-list.nix
@@ -0,0 +1,7 @@
+# Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+[
+  # Your modules.nx files go here
+]
diff --git a/templates/targets/aarch64/nxp/imx8/packages/.gitkeep b/templates/targets/aarch64/nxp/imx8/packages/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/targets/riscv64/microchip/polarfire/flake.nix b/templates/targets/riscv64/microchip/polarfire/flake.nix
index a9582073b..b87382c7f 100644
--- a/templates/targets/riscv64/microchip/polarfire/flake.nix
+++ b/templates/targets/riscv64/microchip/polarfire/flake.nix
@@ -48,18 +48,20 @@
 
       {
         nixosConfigurations.PROJ_NAME-ghaf-debug = ghaf.nixosConfigurations.microchip-icicle-kit-debug.extendModules {
-          modules = [
-            {
-              #insert your additional modules here e.g.
-              # virtualisation.docker.enable = true;
-              # users.users."ghaf".extraGroups = ["docker"];
-            }
-            ({pkgs, ...}: {
-              environment.systemPackages = with pkgs; [
-                #Add additional system packages here
-              ];
-            })
-          ];
+          modules =
+            [
+              {
+                #insert your additional modules here e.g.
+                # virtualisation.docker.enable = true;
+                # users.users."ghaf".extraGroups = ["docker"];
+              }
+              ({pkgs, ...}: {
+                environment.systemPackages = with pkgs; [
+                  #Add additional system packages here
+                ];
+              })
+            ]
+            ++ (import ./modules/modules-list.nix);
         };
         packages.riscv64-linux.PROJ_NAME-ghaf-debug = self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.system.build.sdImage;
       }
diff --git a/templates/targets/riscv64/microchip/polarfire/modules/modules-list.nix b/templates/targets/riscv64/microchip/polarfire/modules/modules-list.nix
new file mode 100644
index 000000000..0de0bf49d
--- /dev/null
+++ b/templates/targets/riscv64/microchip/polarfire/modules/modules-list.nix
@@ -0,0 +1,7 @@
+# Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+[
+  # Your modules.nx files go here
+]
diff --git a/templates/targets/riscv64/microchip/polarfire/packages/.gitkeep b/templates/targets/riscv64/microchip/polarfire/packages/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/targets/x86_64/generic/flake.nix b/templates/targets/x86_64/generic/flake.nix
index e1b09b780..4f04d17bf 100644
--- a/templates/targets/x86_64/generic/flake.nix
+++ b/templates/targets/x86_64/generic/flake.nix
@@ -47,17 +47,19 @@
 
       {
         nixosConfigurations.PROJ_NAME-ghaf-debug = ghaf.nixosConfigurations.generic-x86_64-debug.extendModules {
-          modules = [
-            {
-              #insert your additional modules here e.g.
-              # virtualisation.docker.enable = true;
-              # users.users."ghaf".extraGroups = ["docker"];
+          modules =
+            [
+              {
+                #insert your additional modules here e.g.
+                # virtualisation.docker.enable = true;
+                # users.users."ghaf".extraGroups = ["docker"];
 
-              # To handle the majority of laptops we need a little something extra
-              # TODO:: SEE: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix
-              # nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen
-            }
-          ];
+                # To handle the majority of laptops we need a little something extra
+                # TODO:: SEE: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix
+                # nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen
+              }
+            ]
+            ++ (import ./modules/modules-list.nix);
         };
         packages.x86_64-linux.PROJ_NAME-ghaf-debug = self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.system.build.${self.nixosConfigurations.PROJ_NAME-ghaf-debug.config.formatAttr};
       }
diff --git a/templates/targets/x86_64/generic/modules/modules-list.nix b/templates/targets/x86_64/generic/modules/modules-list.nix
new file mode 100644
index 000000000..0de0bf49d
--- /dev/null
+++ b/templates/targets/x86_64/generic/modules/modules-list.nix
@@ -0,0 +1,7 @@
+# Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+[
+  # Your modules.nx files go here
+]
diff --git a/templates/targets/x86_64/generic/packages/.gitkeep b/templates/targets/x86_64/generic/packages/.gitkeep
new file mode 100644
index 000000000..e69de29bb