diff --git a/templates/group-modules-tpl.json b/templates/group-modules-tpl.json
new file mode 100644
index 0000000000000000000000000000000000000000..e026c70c692e16b73d9890aab97fda1a4303b5b1
--- /dev/null
+++ b/templates/group-modules-tpl.json
@@ -0,0 +1,130 @@
+{
+  "job_name": "Modules tests on {{release_version}} {{pretty}} {{image_date}}",
+  "device_type": "{{device_type}}",
+  "timeout": 10800,
+  "actions": [
+    {
+      "command": "deploy_image",
+      "parameters": {
+        "image": "{{baseurl}}/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "boot_part": 1,
+        "root_part": 6,
+        "bootfstype": "{{bootfstype}}",
+        "login_prompt": "login:",
+        "username": "user",
+        "password_prompt": "Password:",
+        "password": "user",
+        "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 900,
+        "testdef_repos": [
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "common/sanity-check.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "misc/add-repo.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 10000,
+        "testdef_repos": [
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "common/sanity-check.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "common/boot-no-crashes.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/canterbury.yaml"
+          },
+	  {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/didcot.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/frome.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/libbredon.yaml"
+          },
+	  {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/liblightwood.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/libshoreham.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/libthornbury.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/mildenhall.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/newport.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/rhosydd.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/ribchester.yaml"
+          },
+          {
+            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
+            "revision": "master",
+            "testdef": "modules/traprain.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "submit_results",
+      "parameters": {
+        "stream": "{{bundle_stream}}",
+        "server": "https://lava.collabora.co.uk/RPC2/"
+      }
+    }
+  ]
+}