diff --git a/defaults/main.yml b/defaults/main.yml
index fc5d8cb8..1a9722ed 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -157,12 +157,9 @@ ffu_undercloud_releases: ['ocata', 'pike', 'queens']
 ffu_undercloud_repo_type: tripleo-repos
 ffu_undercloud_repo_args:
   tripleo_repos:
-    - release: ocata
-      args: -b ocata current
-    - release: pike
-      args: -b pike current
-    - release: queens
-      args: -b queens current
+    ocata: "-b ocata current"
+    pike: "-b pike current"
+    queens: "-b queens current"
 
 # Tripleo OOOQ variables.
 composable_scenario: ""
diff --git a/tasks/fast-forward-upgrade/create-ffu-scripts.yaml b/tasks/fast-forward-upgrade/create-ffu-scripts.yaml
index 6b9d5f19..2a3bfc11 100644
--- a/tasks/fast-forward-upgrade/create-ffu-scripts.yaml
+++ b/tasks/fast-forward-upgrade/create-ffu-scripts.yaml
@@ -4,8 +4,7 @@
     dest: "{{ working_dir }}/undercloud_upgrade_{{ release }}.sh"
     mode: 0775
   vars:
-    query: "tripleo_repos[?release=='{{release}}'].args"
-    cmd_args: "{{ ffu_undercloud_repo_args | json_query(query) }}"
+    cmd_args: "{{ ffu_undercloud_repo_args['tripleo_repos'][release]|default('') }}"
 
 - name: create {{ release }} pre undercloud upgrade workaround script
   template:
diff --git a/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2 b/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2
index 71487da9..e838cfa6 100644
--- a/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2
+++ b/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2
@@ -7,7 +7,7 @@ set -euo pipefail
 TRIPLEO_REPOS_RPM=$(curl -L --silent https://trunk.rdoproject.org/centos7/current/ | grep python2-tripleo-repos | awk -F "href" {'print $2'} | awk -F '"' {'print $2'})
 sudo yum localinstall -y https://trunk.rdoproject.org/centos7/current/${TRIPLEO_REPOS_RPM}
 
-sudo tripleo-repos {{ cmd_args | join(' ') }} ceph
+sudo tripleo-repos {{ cmd_args }} ceph
 {% endif %}
 
 {% if release == 'ocata' or release == '11' %}