diff --git a/changelogs/fragments/tz_cdb_upgrade_issue.yml b/changelogs/fragments/tz_cdb_upgrade_issue.yml
new file mode 100644
index 000000000..8b4a03c62
--- /dev/null
+++ b/changelogs/fragments/tz_cdb_upgrade_issue.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - set and check _oradb_tzupgrade_candidate_pdbs fact when upgrading timezone for a CDB database
diff --git a/roles/oradb_tzupgrade/tasks/cdb.yml b/roles/oradb_tzupgrade/tasks/cdb.yml
index 3995a3641..9fbabcb80 100644
--- a/roles/oradb_tzupgrade/tasks/cdb.yml
+++ b/roles/oradb_tzupgrade/tasks/cdb.yml
@@ -35,14 +35,14 @@
 
 - name: oradb_tzupgrade | Set facts for pdbs_info
   ansible.builtin.set_fact:
-    candidate_pdbs: "{{ pdbs_info.state.ROW[0].PDB_LIST | default('') }}"
+    _oradb_tzupgrade_candidate_pdbs: "{{ pdbs_info.state.ROW[0].PDB_LIST | default('') }}"
 
 - name: oradb_tzupgrade | Show facts for pdbs_info
   ansible.builtin.debug:
     msg: "Candidate PDBs: {{ _oradb_tzupgrade_candidate_pdbs }}"
 
 - name: oradb_tzupgrade | Upgrade timezone
-  when: candidate_pdbs != ""
+  when: _oradb_tzupgrade_candidate_pdbs != ""
   block:
 
     - name: oradb_tzupgrade | Perform timezone checks for the candidate PDBs