diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index cfffe0949fdae1d51b4b152865e47d486887f05a..111fe0e2c202862acf06e809bad838da83aea223 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": "https://images.apertis.org/{{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 00c78eb3d1cf843554c2c3536cb9565a361e545b..ecf81dd214d7626892cc67ee3852e75f727df5e6 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": "https://images.apertis.org/{{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 c8c39d0e6c6cd26afa17502846489667900272e2..7a6574d1599c9aad668321dee0027179e81d0d6a 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": "https://images.apertis.org/{{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 5c9f7d887babbe85cb83ef9a150548518c3c9d6b..a07bb2bb236148bd0355daac9dae8b2e16e95e6b 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": "https://images.apertis.org/{{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 52a7d1928659f5db1afb3c7eeda7b10508b31f30..8d3f1ffc6b5cb9acb1518c0bffe6e189af626267 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": "https://images.apertis.org/{{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/minimal-tpl.json b/templates/minimal-tpl.json
index 3e63f58fe0bfab82b2f006f37203f66e18ce9d86..0a100bb154dbfbdd54e35d25280e99665fb22740 100644
--- a/templates/minimal-tpl.json
+++ b/templates/minimal-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": "https://images.apertis.org/{{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,
         "login_prompt": "login:",
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index 50b526236aab0fb2741386decd1d4c4f8f00db18..1caf637f0f695b1c48f79448d96c3d322f09adca 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": "https://images.apertis.org/{{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}}",