diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml
index f35a1c50585d9c52736168193b2a670f79c80c6f..f3ddbeafdb7dc091844d3b96d70e210b2225faad 100644
--- a/ansible/container-image-build.yml
+++ b/ansible/container-image-build.yml
@@ -41,8 +41,9 @@
         password: "{{ kolla_docker_registry_password }}"
         reauthorize: yes
       when:
-        - kolla_docker_registry_username is not none
-        - kolla_docker_registry_password is not none
+        # NOTE(wszumski): Switch to truthy filter when min ansible>=2.10.5
+        - kolla_docker_registry_username not in [none, ""]
+        - kolla_docker_registry_password not in [none, ""]
 
     - name: Ensure Kolla container images are built
       shell: