diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index cde9c0fabe..bc1f68fccb 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -17,6 +17,11 @@
 
   vars_files:
     - /srv/web/infra/ansible/vars/global.yml
+    - "/srv/web/infra/ansible/vars/all/00-FedoraCycleNumber.yaml"
+    - "/srv/web/infra/ansible/vars/all/FedoraPreviousCycleNumber.yaml"
+    - "/srv/web/infra/ansible/vars/all/FedoraPreviousPrevious.yaml"
+    - "/srv/web/infra/ansible/vars/all/FedoraPreviousPreviousCycleNumber.yaml"
+
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates
deleted file mode 100644
index f8f0e113bc..0000000000
--- a/roles/releng/files/cloud-updates
+++ /dev/null
@@ -1,11 +0,0 @@
-# Fedora 41 Cloud nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
-15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF41.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
-
-# Fedora 40 Cloud nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
-15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF40.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
-
-# Fedora 39 Cloud nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
-15 6 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF39.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates
deleted file mode 100644
index 3c0c7bca4d..0000000000
--- a/roles/releng/files/container-updates
+++ /dev/null
@@ -1,11 +0,0 @@
-# Fedora 41 Container Updates nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
-45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF41.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
-
-#Fedora 40 Container Updates nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
-45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF40.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
-
-# Fedora 39 Container Updates nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
-45 7 * * * root touch /tmp/fedora-compose-container-updates &&  TMPDIR=`mktemp -d /tmp/containerF39.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index cb13b549ca..c24c4fa7c7 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -316,16 +316,16 @@
 
 # put cron job in for cloud nightly compose
 - name: Cloud updates compose cron
-  ansible.builtin.copy:
-    src: cloud-updates
+  ansible.builtin.template:
+    src: cloud-updates.j2
     dest: /etc/cron.d/cloud-updates
     mode: "644"
   when: inventory_hostname.startswith('compose-x86-01.iad2')
 
 # put cron job in for docker nightly compose
 - name: Docker compose cron
-  ansible.builtin.copy:
-    src: container-updates
+  ansible.builtin.template:
+    src: container-updates.j2
     dest: /etc/cron.d/container-updates
     mode: "644"
   when: inventory_hostname.startswith('compose-x86-01.iad2')
diff --git a/roles/releng/templates/cloud-updates.j2 b/roles/releng/templates/cloud-updates.j2
new file mode 100644
index 0000000000..d9eea81c94
--- /dev/null
+++ b/roles/releng/templates/cloud-updates.j2
@@ -0,0 +1,13 @@
+# Fedora {{ FedoraCycleNumber }} Cloud nightly compose
+MAILTO=releng-cron@lists.fedoraproject.org
+15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
+
+# Fedora {{ FedoraPreviousCycleNumber }} Cloud nightly compose
+MAILTO=releng-cron@lists.fedoraproject.org
+15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
+
+{% if FedoraPreviousPrevious %}
+# Fedora {{ FedoraPreviousPreviousCycleNumber }} Cloud nightly compose
+MAILTO=releng-cron@lists.fedoraproject.org
+15 6 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraPreviousPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousPreviousCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
+{% endif %}
diff --git a/roles/releng/templates/container-updates.j2 b/roles/releng/templates/container-updates.j2
new file mode 100644
index 0000000000..2fe3e398ae
--- /dev/null
+++ b/roles/releng/templates/container-updates.j2
@@ -0,0 +1,13 @@
+# Fedora {{ FedoraCycleNumber }} Container Updates nightly compose
+MAILTO=releng-cron@lists.fedoraproject.org
+45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF{{ FedoraCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
+
+#Fedora {{ FedoraPreviousCycleNumber }} Container Updates nightly compose
+MAILTO=releng-cron@lists.fedoraproject.org
+45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF{{ FedoraPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
+
+{% if FedoraPreviousPrevious %}
+# Fedora {{ FedoraPreviousPreviousCycleNumber }} Container Updates nightly compose
+MAILTO=releng-cron@lists.fedoraproject.org
+45 7 * * * root touch /tmp/fedora-compose-container-updates &&  TMPDIR=`mktemp -d /tmp/containerF{{ FedoraPreviousPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousPreviousCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
+{% endif %}