diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml
index dd3ef62ad0..50d01ecc1c 100644
--- a/playbooks/groups/maintainer-test.yml
+++ b/playbooks/groups/maintainer-test.yml
@@ -40,7 +40,7 @@
 
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_vars: dir=/srv/web/infra/ansible/vars/all/
+  - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
   - debug: var=FedoraRawhideNumber
   - debug: var=FedoraBranchedNumber
   - debug: var=FedoraOldCycleNumber
diff --git a/vars/all/FedoraBranchedNumber.yaml b/vars/all/FedoraBranchedNumber.yaml
index 62ec1ba74e..760ba7b648 100644
--- a/vars/all/FedoraBranchedNumber.yaml
+++ b/vars/all/FedoraBranchedNumber.yaml
@@ -1 +1 @@
-FedoraBranchedNumber: "{{ FedoraCycleNumber }}|int + 1"
+FedoraBranchedNumber: {{ FedoraCycleNumber + 1 }}|int
diff --git a/vars/all/FedoraOldCycleNumber.yaml b/vars/all/FedoraOldCycleNumber.yaml
index d40c7b412c..494f84150b 100644
--- a/vars/all/FedoraOldCycleNumber.yaml
+++ b/vars/all/FedoraOldCycleNumber.yaml
@@ -1 +1 @@
-FedoraOldCycleNumber: 27
+FedoraOldCycleNumber: {{ FedoraCycleNumber - 1 }}|int
diff --git a/vars/all/FedoraRawhideNumber.yaml b/vars/all/FedoraRawhideNumber.yaml
index edee4dcf41..57f28c1a3c 100644
--- a/vars/all/FedoraRawhideNumber.yaml
+++ b/vars/all/FedoraRawhideNumber.yaml
@@ -1 +1 @@
-FedoraRawhideNumber: "{{ FedoraBranchedNumber }}|int + 1"
+FedoraRawhideNumber: {{ FedoraBranchedNumber + 1 }}|int