diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml
index 103d8ccf94..dd3ef62ad0 100644
--- a/playbooks/groups/maintainer-test.yml
+++ b/playbooks/groups/maintainer-test.yml
@@ -38,11 +38,9 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
-  include_vars:
-   - dir: /srv/web/infra/ansible/vars/all/
-
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - include_vars: dir=/srv/web/infra/ansible/vars/all/
   - debug: var=FedoraRawhideNumber
   - debug: var=FedoraBranchedNumber
   - debug: var=FedoraOldCycleNumber
diff --git a/vars/all/00-FedoraCycleNumber.yaml b/vars/all/00-FedoraCycleNumber.yaml
index 9902f17848..162ecdceca 100644
--- a/vars/all/00-FedoraCycleNumber.yaml
+++ b/vars/all/00-FedoraCycleNumber.yaml
@@ -1 +1 @@
-28
+FedoraCycleNumber: 28