diff --git a/data/autoyast_sle15/autoyast_pcm_lgm_allpatterns_ppc64le.xml.ep b/data/yam/autoyast/autoyast_pcm_lgm_allpatterns_ppc64le.xml.ep
similarity index 100%
rename from data/autoyast_sle15/autoyast_pcm_lgm_allpatterns_ppc64le.xml.ep
rename to data/yam/autoyast/autoyast_pcm_lgm_allpatterns_ppc64le.xml.ep
diff --git a/data/yam/autoyast/autoyast_sle_powervm.xml.ep b/data/yam/autoyast/autoyast_sle_powervm.xml.ep
new file mode 100644
index 000000000000..27dad71aedfa
--- /dev/null
+++ b/data/yam/autoyast/autoyast_sle_powervm.xml.ep
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE profile>
+<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+  <suse_register>
+    <do_registration config:type="boolean">true</do_registration>
+    <email/>
+    <reg_code>{{SCC_REGCODE}}</reg_code>
+    <install_updates config:type="boolean">true</install_updates>
+    <reg_server>{{SCC_URL}}</reg_server>
+    % if (keys %$addons) {
+    <addons config:type="list">
+        % while (my ($key, $addon) = each (%$addons)) {
+        <addon>
+            <name><%= $addon->{name} %></name>
+            <version><%= $addon->{version} %></version>
+            <arch><%= $addon->{arch} %></arch>
+            % if ($key eq 'ltss') {
+            <reg_code><%= $get_var->('SCC_REGCODE_LTSS') %></reg_code>
+            % }
+            % if ($key eq 'live') {
+            <reg_code><%= $get_var->('SCC_REGCODE_LIVE') %></reg_code>
+            % }
+        </addon>
+        % }
+    </addons>
+    %}
+  </suse_register>
+  <bootloader>
+      <global>
+          <timeout config:type="integer">-1</timeout>
+      </global>
+  </bootloader>
+  <general>
+    <mode>
+      <confirm config:type="boolean">false</confirm>
+    </mode>
+  </general>
+  <report>
+    <errors>
+      <log config:type="boolean">true</log>
+      <show config:type="boolean">true</show>
+      <timeout config:type="integer">0</timeout>
+    </errors>
+    <messages>
+      <log config:type="boolean">true</log>
+      <show config:type="boolean">true</show>
+      <timeout config:type="integer">0</timeout>
+    </messages>
+    <warnings>
+      <log config:type="boolean">true</log>
+      <show config:type="boolean">true</show>
+      <timeout config:type="integer">0</timeout>
+    </warnings>
+    <yesno_messages>
+      <log config:type="boolean">true</log>
+      <show config:type="boolean">true</show>
+      <timeout config:type="integer">0</timeout>
+    </yesno_messages>
+  </report>
+  <keyboard>
+    <keyboard_values>
+      <delay/>
+      <discaps config:type="boolean">false</discaps>
+      <numlock>bios</numlock>
+      <rate/>
+    </keyboard_values>
+    <keymap>english-us</keymap>
+  </keyboard>
+  <language>
+    <language>en_US</language>
+    <languages/>
+  </language>
+  <ntp-client>
+    <ntp_policy>auto</ntp_policy>
+  </ntp-client>
+  <services-manager config:type="map">
+    <default_target>multi-user</default_target>
+    <services config:type="map">
+      <enable config:type="list">
+        <service>firewalld</service>
+	<service>wicked</service>
+        <service>sshd</service>
+      </enable>
+    </services>
+  </services-manager>
+  <software>
+    <packages config:type="list">
+    % foreach (values %$addons) {
+        <package><%= lc($_->{name}) %>-release</package>
+    % }
+    </packages>
+    <patterns config:type="list">
+      <pattern>apparmor</pattern>
+      <pattern>base</pattern>
+      <pattern>basesystem</pattern>
+      <pattern>enhanced_base</pattern>
+      <pattern>minimal_base</pattern>
+      <pattern>x11</pattern>
+      <pattern>x11_yast</pattern>
+      <pattern>yast2_basis</pattern>
+    </patterns>
+    <products config:type="list">
+      <product>SLES</product>
+    </products>
+  </software>
+  <networking>
+    <interfaces config:type="list">
+      <interface>
+        <bootproto>dhcp</bootproto>
+        <device>eth0</device>
+        <dhclient_set_default_route>yes</dhclient_set_default_route>
+        <startmode>auto</startmode>
+      </interface>
+    </interfaces>
+  </networking>
+  <partitioning config:type="list">
+     <drive>
+        <device>/dev/sda</device>
+        <initialize config:type="boolean">true</initialize> 
+     </drive>
+  </partitioning>
+  <firewall config:type="map">
+    <default_zone>public</default_zone>
+    <enable_firewall config:type="boolean">true</enable_firewall>
+    <log_denied_packets>off</log_denied_packets>
+    <start_firewall config:type="boolean">true</start_firewall>
+    <zones config:type="list">
+      <zone config:type="map">
+        <description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
+        <interfaces config:type="list">
+          <interface>eth0</interface>
+        </interfaces>
+        <masquerade config:type="boolean">false</masquerade>
+        <name>public</name>
+        <ports config:type="list"/>
+        <protocols config:type="list"/>
+        <services config:type="list">
+          <service>dhcpv6-client</service>
+          <service>ssh</service>
+          <service>tigervnc</service>
+          <service>tigervnc-https</service>
+        </services>
+        <short>Public</short>
+        <target>default</target>
+      </zone>
+    </zones>
+  </firewall>
+  <timezone>
+    <hwclock>UTC</hwclock>
+    <timezone>Europe/Berlin</timezone>
+  </timezone>
+  <users config:type="list">
+    <user>
+      <encrypted config:type="boolean">false</encrypted>
+      <fullname>Bernhard M. Wiedemann</fullname>
+      <gid>100</gid>
+      <home>/home/bernhard</home>
+      <password_settings>
+        <expire/>
+        <flag/>
+        <inact>-1</inact>
+        <max>99999</max>
+        <min>0</min>
+        <warn>7</warn>
+      </password_settings>
+      <shell>/bin/bash</shell>
+      <uid>1000</uid>
+      <user_password>nots3cr3t</user_password>
+      <username>bernhard</username>
+    </user>
+    <user>
+      <encrypted config:type="boolean">false</encrypted>
+      <fullname>root</fullname>
+      <gid>0</gid>
+      <home>/root</home>
+      <password_settings>
+        <expire/>
+        <flag/>
+        <inact/>
+        <max/>
+        <min/>
+        <warn/>
+      </password_settings>
+      <shell>/bin/bash</shell>
+      <uid>0</uid>
+      <user_password>nots3cr3t</user_password>
+      <username>root</username>
+    </user>
+  </users>
+</profile>
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_gnome_allpatterns_aarch64.xml b/data/yam/support_images/create_hdd_gnome_allpatterns_aarch64.xml
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_gnome_allpatterns_aarch64.xml
rename to data/yam/support_images/create_hdd_gnome_allpatterns_aarch64.xml
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_gnome_disabled_firewall.xml b/data/yam/support_images/create_hdd_gnome_disabled_firewall.xml
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_gnome_disabled_firewall.xml
rename to data/yam/support_images/create_hdd_gnome_disabled_firewall.xml
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_gnome_s390x.xml b/data/yam/support_images/create_hdd_gnome_s390x.xml
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_gnome_s390x.xml
rename to data/yam/support_images/create_hdd_gnome_s390x.xml
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_gnome_sdk_allpatterns_aarch64.xml b/data/yam/support_images/create_hdd_gnome_sdk_allpatterns_aarch64.xml
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_gnome_sdk_allpatterns_aarch64.xml
rename to data/yam/support_images/create_hdd_gnome_sdk_allpatterns_aarch64.xml
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_gnome_sdk_allpatterns_s390x.xml b/data/yam/support_images/create_hdd_gnome_sdk_allpatterns_s390x.xml
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_gnome_sdk_allpatterns_s390x.xml
rename to data/yam/support_images/create_hdd_gnome_sdk_allpatterns_s390x.xml
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_ha_aarch64.xml.ep b/data/yam/support_images/create_hdd_ha_aarch64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_ha_aarch64.xml.ep
rename to data/yam/support_images/create_hdd_ha_aarch64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_ha_ppc64le.xml.ep b/data/yam/support_images/create_hdd_ha_ppc64le.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_ha_ppc64le.xml.ep
rename to data/yam/support_images/create_hdd_ha_ppc64le.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_ha_s390x.xml.ep b/data/yam/support_images/create_hdd_ha_s390x.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_ha_s390x.xml.ep
rename to data/yam/support_images/create_hdd_ha_s390x.xml.ep
diff --git a/data/autoyast_sle12/create_hdd/create_hdd_ha_sles.xml.ep b/data/yam/support_images/create_hdd_ha_sles.xml.ep
similarity index 100%
rename from data/autoyast_sle12/create_hdd/create_hdd_ha_sles.xml.ep
rename to data/yam/support_images/create_hdd_ha_sles.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_ha_x86_64.xml.ep b/data/yam/support_images/create_hdd_ha_x86_64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_ha_x86_64.xml.ep
rename to data/yam/support_images/create_hdd_ha_x86_64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_hpc_development_node_aarch64.xml.ep b/data/yam/support_images/create_hdd_hpc_development_node_aarch64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_hpc_development_node_aarch64.xml.ep
rename to data/yam/support_images/create_hdd_hpc_development_node_aarch64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_hpc_development_node_x86_64.xml.ep b/data/yam/support_images/create_hdd_hpc_development_node_x86_64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_hpc_development_node_x86_64.xml.ep
rename to data/yam/support_images/create_hdd_hpc_development_node_x86_64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_hpc_management_server_aarch64.xml.ep b/data/yam/support_images/create_hdd_hpc_management_server_aarch64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_hpc_management_server_aarch64.xml.ep
rename to data/yam/support_images/create_hdd_hpc_management_server_aarch64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_hpc_management_server_x86_64.xml.ep b/data/yam/support_images/create_hdd_hpc_management_server_x86_64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_hpc_management_server_x86_64.xml.ep
rename to data/yam/support_images/create_hdd_hpc_management_server_x86_64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_hpc_textmode_aarch64.xml.ep b/data/yam/support_images/create_hdd_hpc_textmode_aarch64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_hpc_textmode_aarch64.xml.ep
rename to data/yam/support_images/create_hdd_hpc_textmode_aarch64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_hpc_textmode_x86_64.xml.ep b/data/yam/support_images/create_hdd_hpc_textmode_x86_64.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_hpc_textmode_x86_64.xml.ep
rename to data/yam/support_images/create_hdd_hpc_textmode_x86_64.xml.ep
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_sap.xml.ep b/data/yam/support_images/create_hdd_sap.xml.ep
similarity index 100%
rename from data/autoyast_sle15/create_hdd/create_hdd_sap.xml.ep
rename to data/yam/support_images/create_hdd_sap.xml.ep
diff --git a/data/autoyast_sle12/create_hdd/create_hdd_sles_regression_aarch64.xml.ep b/data/yam/support_images/create_hdd_sles_regression_aarch64.xml.ep
similarity index 100%
rename from data/autoyast_sle12/create_hdd/create_hdd_sles_regression_aarch64.xml.ep
rename to data/yam/support_images/create_hdd_sles_regression_aarch64.xml.ep
diff --git a/data/autoyast_sle12/create_hdd/create_hdd_sles_regression_ppc64le.xml.ep b/data/yam/support_images/create_hdd_sles_regression_ppc64le.xml.ep
similarity index 100%
rename from data/autoyast_sle12/create_hdd/create_hdd_sles_regression_ppc64le.xml.ep
rename to data/yam/support_images/create_hdd_sles_regression_ppc64le.xml.ep
diff --git a/data/autoyast_sle12/create_hdd/create_hdd_sles_regression_s390x.xml.ep b/data/yam/support_images/create_hdd_sles_regression_s390x.xml.ep
similarity index 100%
rename from data/autoyast_sle12/create_hdd/create_hdd_sles_regression_s390x.xml.ep
rename to data/yam/support_images/create_hdd_sles_regression_s390x.xml.ep
diff --git a/schedule/migration/autoyast_regression_test_online_pre@pvm.yaml b/schedule/migration/autoyast_regression_test_online_pre@pvm.yaml
index 89d4b59e8249..068c292a682a 100644
--- a/schedule/migration/autoyast_regression_test_online_pre@pvm.yaml
+++ b/schedule/migration/autoyast_regression_test_online_pre@pvm.yaml
@@ -2,10 +2,6 @@
 name: autoyast_regression_test_online_pre@pvm
 description: >
   autoYaST installation and prepare base system
-vars:
-  AUTOYAST: autoyast_sle15/autoyast_sle_powervm.xml.ep
-  AUTOYAST_PREPARE_PROFILE: '1'
-  DESKTOP: textmode
 schedule:
   - autoyast/prepare_profile
   - installation/bootloader_start
diff --git a/schedule/yast/autoyast/autoyast_ha.yaml b/schedule/yast/autoyast/autoyast_ha.yaml
index d6a55720405e..da5eb75f447a 100644
--- a/schedule/yast/autoyast/autoyast_ha.yaml
+++ b/schedule/yast/autoyast/autoyast_ha.yaml
@@ -4,7 +4,6 @@ description: >
   HA autoYaST installation and publish qcow for ha migration standalone
   cases.
 vars:
-  AUTOYAST: autoyast_sle15/create_hdd/create_hdd_ha_%ARCH%.xml.ep
   AUTOYAST_PREPARE_PROFILE: '1'
   DESKTOP: textmode
   SYSTEM_ROLE: HA_node
diff --git a/schedule/yast/autoyast/autoyast_sap.yaml b/schedule/yast/autoyast/autoyast_sap.yaml
index e606bec31cbe..2d16afdc3fe3 100644
--- a/schedule/yast/autoyast/autoyast_sap.yaml
+++ b/schedule/yast/autoyast/autoyast_sap.yaml
@@ -4,7 +4,6 @@ description: >
   SAP autoYaST installation and publish qcow for SAP migration standalone
   cases.
 vars:
-  AUTOYAST: autoyast_sle15/create_hdd/create_hdd_sap.xml.ep
   AUTOYAST_PREPARE_PROFILE: '1'
   NW: 'nfs://10.162.31.119/srv/nfs/sap/NW75_CLUSTER'
   INSTANCE_ID: '00'