diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index 6e66bf8352190293f507f1dd7005d7ee56bbb346..6356384028e1245cfe47f55824b056f155fff807 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}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+ "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",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index a68b68df87215882b27b4c004a7fa26af7adb1f5..af34d9b74e8aead8a427fcd47a21bb60db0cd803 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}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+ "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",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index e0c5e2aea6686b7e11738b10dc9e373e20df6f2f..af1339a60e31570798190bc806c8dff1e9333d27 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}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+ "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",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index d659f3340b17301213ee2000d64cfc2561b3257a..1e995c2298bc1608509549505f8ecdae438c688e 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}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+ "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",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index ae2774aac23738abc756630806c53331381943f9..7e8636783b8596e5ec10e9203f8f7b34ab3f92f9 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}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+ "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",
"boot_part": 1,
"root_part": 2,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/profiles.yaml b/templates/profiles.yaml
index 02b1a81610c496220b110c442f64540d8698dad6..41f486508c283b7624a23147f694b6dfa9033a2c 100644
--- a/templates/profiles.yaml
+++ b/templates/profiles.yaml
@@ -42,8 +42,6 @@ profiles:
arch: amd64
image_type: target-wayland
board: amd64-uefi
- opt_image_type: target
- opt_board: amd64-uefi-wayland
- name: apertis-16.03-daily-i386-vm-development
variables:
pretty: "I386 VM using development image"
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index 39e8877d8623b8c86590818c5dc942a347511688..620177b6b51286d1ae689918012a5a7ae89c9526 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}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
+ "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",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",