diff --git a/tasks/answerfile.yml b/tasks/answerfile.yml
index 1f4361cc86bdabe4daf651400f6a7ab9b39bda5c..fb098c2ab94ed86c5d166d0864ace6f74522e0ab 100644
--- a/tasks/answerfile.yml
+++ b/tasks/answerfile.yml
@@ -1,5 +1,12 @@
 
-- name: create answerfile for "{{ inventory_hostname }}"
+- import_role:
+    name: system
+    tasks_from: answerfile
+
+- name: create answer file
   template:
     src: answerfile.j2
     dest: "{{ system_answerfile_path }}"
+  delegate_to: "{{ system_answerfile_server }}"
+  when: (system_answerfile_state | default(present)) == "present"
+