diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index 399ff4f06a08297bdf3acce3c9b2998aca90a3c7..d4c4e864b6bf82b1a1bee68ba22b16ad6a6b58ac 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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 71d7a1fa2087d8c169f516092ac79e65f3970a1d..60e4446683817c9eb7e3db0444301a888b32efa4 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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 ab84eeb0ec4f54659b83e4d6328e011a10998918..a5aee39f1226b40bfee99443b72826d857a234a6 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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 89ee9dbb5458d251948a00aec3507466687351ce..99771e2df913e7bd668cf26204efb5f9b8978ab5 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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 918d9a037fccc6d946974db1a73c2b4a417fb7d9..3d9d806267d85888a3c6c21514f5b475d52d6d00 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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 ab921c4f26b1c95ccdf9243615bfe0bd59909ee3..de214fde0f63702271e259e56b1bc6eee104b27d 100644
--- a/templates/minimal-tpl.json
+++ b/templates/minimal-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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 a7cfeb63ef0864909390a97a08f3756a04aaec9f..c226b9252a618ed769ed877c6d512ab64ae48fad 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -6,7 +6,7 @@
     {
       "command": "deploy_image",
       "parameters": {
-        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+        "image": "https://sac-dev:Apa8Uo1mIeNgie6u@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}}",