diff --git a/tasks/answerfile.yml b/tasks/answerfile.yml
index fb098c2ab94ed86c5d166d0864ace6f74522e0ab..eb21e27b0bb96452859b8b351df9c138445c9346 100644
--- a/tasks/answerfile.yml
+++ b/tasks/answerfile.yml
@@ -1,7 +1,7 @@
 
-- import_role:
-    name: system
-    tasks_from: answerfile
+- call_tasks:
+    from: answerfile
+    super: true
 
 - name: create answer file
   template:
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 3c40b726d5c6b42f69745cb39d16b416148bb822..21cadaf1f85e4658daa64ff30f302c5a1cd53722 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,8 +1,8 @@
 ---
 
-- import_role:
-    name: system
-    tasks_from: configure
+- call_tasks:
+    from: configure
+    super: true
 
 - name: install locale.gen file
   template:
diff --git a/tasks/finaliseinstaller.yml b/tasks/finaliseinstaller.yml
index 569a53f1f613ede88c0c733ce9006c377f8f7984..57e2180c89baefdba3f31fb1dfe4fb9b054828d6 100644
--- a/tasks/finaliseinstaller.yml
+++ b/tasks/finaliseinstaller.yml
@@ -35,16 +35,15 @@
   args:
     chdir: "{{ _linux_temporary_root_directory.path }}"
 
-- include_role:
-     name: system.linux
-     tasks_from: _mergeimages
+- call_tasks:
+     from: _mergeimages
   loop: "{{ system_supported_architectures[linux_installer_distribution] }}"   
   loop_control:      
     loop_var: _linux_dist_arch
 
-- include_role:
-     name: system
-     tasks_from: installer
+- call_tasks:
+     from: installer
+     super: true
 
 - name: cleanup temporary root directory
   file:
diff --git a/tasks/installer.yml b/tasks/installer.yml
index 61fbad0a5702d3c27b8b21937281e8a4fea926a4..1fc09eb967d9e07e7667b1942318c41fc84db880 100644
--- a/tasks/installer.yml
+++ b/tasks/installer.yml
@@ -1,3 +1,6 @@
 
-- include_tasks: buildinstaller.yml
-- include_tasks: finaliseinstaller.yml
+- call_tasks: 
+    from: buildinstaller.yml
+
+- call_tasks: 
+    from: finaliseinstaller.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index d1c10e4952307ba433d5afddca21b2e689160b0f..9c488374f9a5c2f9157206078bce417f30538cc1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 # tasks file for sytsem.linux
 
-- include_role:
-    name: system
+- call_tasks:
+    from: main
+    super: true
 
-- import_role:
-    name: system.linux
-    tasks_from: configure
+- call_tasks:
+    from: configure
diff --git a/tasks/reboot.yml b/tasks/reboot.yml
deleted file mode 100644
index 73e99726b28bbfac27af82b5de785dbedec6898f..0000000000000000000000000000000000000000
--- a/tasks/reboot.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include_role:
-    name: system
-    tasks_from: reboot
diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml
deleted file mode 100644
index cd21505a47e530a967e3c44bd2a772d1b8d08bd7..0000000000000000000000000000000000000000
--- a/tasks/upgrade.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-