diff --git a/roles/foreman_installer_devel_scenario/files/katello-devel.yaml b/roles/foreman_installer_devel_scenario/files/katello-devel.yaml
index d86a2b7ae..5a250b9cc 100644
--- a/roles/foreman_installer_devel_scenario/files/katello-devel.yaml
+++ b/roles/foreman_installer_devel_scenario/files/katello-devel.yaml
@@ -5,8 +5,6 @@
 :log_name: katello-devel.log
 :log_level: DEBUG
 :no_prefix: false
-# Forklift always overwrites the answers so let's not pretend we save them
-:dont_save_answers: true
 :answer_file: /etc/foreman-installer/scenarios.d/katello-devel-answers.yaml
 :installer_dir: /usr/share/foreman-installer
 :module_dirs: /usr/share/foreman-installer/modules
diff --git a/roles/foreman_installer_devel_scenario/tasks/main.yml b/roles/foreman_installer_devel_scenario/tasks/main.yml
index 81de9be06..ef70333b1 100644
--- a/roles/foreman_installer_devel_scenario/tasks/main.yml
+++ b/roles/foreman_installer_devel_scenario/tasks/main.yml
@@ -16,10 +16,11 @@
   with_items:
     - katello-devel.yaml
 
-- name: 'Copy answers file'
+- name: "Create devel scenario answers file if it doesn't already exist"
   template:
     src: "{{ role_path }}/templates/{{ item }}"
     dest: /etc/foreman-installer/scenarios.d/{{ item }}
+    force: no
   with_items:
     - katello-devel-answers.yaml
 
diff --git a/roles/foreman_installer_devel_scenario/templates/katello-devel-answers.yaml b/roles/foreman_installer_devel_scenario/templates/katello-devel-answers.yaml
index df67e2a50..5d973d287 100644
--- a/roles/foreman_installer_devel_scenario/templates/katello-devel-answers.yaml
+++ b/roles/foreman_installer_devel_scenario/templates/katello-devel-answers.yaml
@@ -1,11 +1,6 @@
 ---
-certs:
-  group: {{ foreman_installer_devel_scenario_group | default(foreman_installer_devel_scenario_user) }}
-  deploy: true
-  generate: true
-katello_devel:
-  deployment_dir: /home/{{ foreman_installer_devel_scenario_user }}
-  user: {{ foreman_installer_devel_scenario_user }}
+certs: true
+katello_devel: true
 foreman_proxy_content:
   enable_katello_agent: true
   proxy_pulp_yum_to_pulpcore: true
diff --git a/roles/katello_devel/meta/main.yml b/roles/katello_devel/meta/main.yml
index d94a09529..3ec2b892d 100644
--- a/roles/katello_devel/meta/main.yml
+++ b/roles/katello_devel/meta/main.yml
@@ -23,4 +23,7 @@ dependencies:
       - "--katello-devel-admin-password {{ foreman_installer_admin_password }}"
       - "{{ '--katello-devel-github-username=' + katello_devel_github_username if katello_devel_github_username is defined else '' }}"
       - "--katello-devel-extra-plugins theforeman/foreman_remote_execution"
+      - "{{ '--katello-devel-deployment-dir' }} {{ '/home/' + foreman_installer_devel_scenario_user }}"
+      - "{{ '--katello-devel-user' }} {{ foreman_installer_devel_scenario_user }}"
+      - "{{ '--certs-group' }} {{ foreman_installer_devel_scenario_group | default(foreman_installer_devel_scenario_user) }}"
   - role: customize_home