diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index ef2079bc..7b111da9 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -3,6 +3,8 @@ image_pull_secret: ''
 image_pull_secrets: []
 operator_service_account_name: '{{ lookup("env","OPERATOR_SA_NAME") | default("galaxy-operator-sa",true) }}'
 bundle_cacert_secret: ''
+db_fields_encryption_secret: ''
+container_token_secret: ''
 
 # Proxy environment variables for Galaxy containers.
 # Values are inherited from the operator pod environment.
diff --git a/roles/common/tasks/db_fields_encryption_configuration.yml b/roles/common/tasks/db_fields_encryption_configuration.yml
index 2fb7d1f6..7463dbbc 100644
--- a/roles/common/tasks/db_fields_encryption_configuration.yml
+++ b/roles/common/tasks/db_fields_encryption_configuration.yml
@@ -15,7 +15,7 @@
   set_fact:
     db_fields_encryption_secret: '{{ ansible_operator_meta.name }}-db-fields-encryption'
     cacheable: yes
-  when: db_fields_encryption_secret is undefined
+  when: not db_fields_encryption_secret | default('')
 
 - name: Check for specified DB fields encryption configuration
   k8s_info:
diff --git a/roles/galaxy-config/tasks/combine_galaxy_settings.yml b/roles/galaxy-config/tasks/combine_galaxy_settings.yml
index a9f3e49e..c7fd910f 100644
--- a/roles/galaxy-config/tasks/combine_galaxy_settings.yml
+++ b/roles/galaxy-config/tasks/combine_galaxy_settings.yml
@@ -32,7 +32,7 @@
   set_fact:
     container_token_secret: '{{ ansible_operator_meta.name }}-container-auth'
     cacheable: yes
-  when: container_token_secret is not defined
+  when: not container_token_secret | default('')
 
 - include_tasks:
     file: get_node_ip.yml