diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index 111fe0e2c202862acf06e809bad838da83aea223..b9edf037b10fc8e1ec1fecc42e4aebea4127d9ca 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "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}}",
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index ecf81dd214d7626892cc67ee3852e75f727df5e6..0eb041b65aebb96a703fff391417029e96466da2 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "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}}",
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 7a6574d1599c9aad668321dee0027179e81d0d6a..03a216480fe22536662a1e56410c2815bb2e83d1 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "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}}",
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index a07bb2bb236148bd0355daac9dae8b2e16e95e6b..ca93781d40bdc52e3276ec29b4cc84c8a14fd073 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "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}}",
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index 8d3f1ffc6b5cb9acb1518c0bffe6e189af626267..27c5ce3147cdf0dbbcb1b46cfb329ff91bbe44de 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "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": 2,
         "bootfstype": "{{bootfstype}}",
diff --git a/templates/profiles.yaml b/templates/profiles.yaml
index 41f486508c283b7624a23147f694b6dfa9033a2c..4191d4171526b2d7c1a8b675662eea90b793c66a 100644
--- a/templates/profiles.yaml
+++ b/templates/profiles.yaml
@@ -11,6 +11,7 @@ main-profile:
     release_version: "16.03"
     fs: btrfs
     image_variant: collabora
+    baseurl: "https://images.apertis.org"
 
 profiles:
   - name: apertis-16.03-daily-minnowboard-max-minimal
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index 1caf637f0f695b1c48f79448d96c3d322f09adca..6581f20fbef9670d9b7a851c4ba789177f578524 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "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}}",