diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index b9edf037b10fc8e1ec1fecc42e4aebea4127d9ca..4b2b0bdc66c6cb74960c9a6484929091930dd0a0 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -168,7 +168,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index 0eb041b65aebb96a703fff391417029e96466da2..fe1f0e68687a221740b40aaf98b2337f340e1233 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -98,7 +98,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 03a216480fe22536662a1e56410c2815bb2e83d1..c76b3fbf016ac5a47efd71bc3b47ff32e71cf926 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -409,7 +409,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index ca93781d40bdc52e3276ec29b4cc84c8a14fd073..155b71b81e8164638836e8d62187735447a0f2c3 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -97,7 +97,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index 27c5ce3147cdf0dbbcb1b46cfb329ff91bbe44de..9f7876d4ea82566e2b77956bf89b7c6434c2c8d9 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -87,7 +87,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/minimal-predeployed-1503-target-tpl.json b/templates/minimal-predeployed-1503-target-tpl.json
index 13a3e7b71fe2ea4dc04e14abc9f97425dc47d109..f1f7d639ca9efd1474a4c0ddb862da05e2757a31 100644
--- a/templates/minimal-predeployed-1503-target-tpl.json
+++ b/templates/minimal-predeployed-1503-target-tpl.json
@@ -38,7 +38,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/minimal-tpl.json b/templates/minimal-tpl.json
index 0a100bb154dbfbdd54e35d25280e99665fb22740..f003b1905e62a5591642640894b4734192fc63b6 100644
--- a/templates/minimal-tpl.json
+++ b/templates/minimal-tpl.json
@@ -37,7 +37,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }
diff --git a/templates/profiles.yaml b/templates/profiles.yaml
index 29f3e4fdedad161e7f93072cdd41033a59f731f6..d569846681d385822929cf62c45dd74308b1c40a 100644
--- a/templates/profiles.yaml
+++ b/templates/profiles.yaml
@@ -12,6 +12,7 @@ main-profile:
     fs: btrfs
     image_variant: collabora
     baseurl: "https://images.apertis.org"
+    bundle_stream: "/public/personal/apertis-validator/"
 
 profiles:
   - name: apertis-16.06-daily-minnowboard-max-minimal
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index 6581f20fbef9670d9b7a851c4ba789177f578524..fdf310d5adcbc2286f71243e8b2a6c2823a51f82 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -62,7 +62,7 @@
     {
       "command": "submit_results",
       "parameters": {
-        "stream": "/private/team/Apertis/",
+        "stream": "{{bundle_stream}}",
         "server": "https://lava.collabora.co.uk/RPC2/"
       }
     }