diff --git a/etc/kayobe/ansible/hotfix-containers.yml b/etc/kayobe/ansible/hotfix-containers.yml
index b6a811801a..677105f3e7 100644
--- a/etc/kayobe/ansible/hotfix-containers.yml
+++ b/etc/kayobe/ansible/hotfix-containers.yml
@@ -30,13 +30,13 @@
 
     - name: Set fact for containers list
       set_fact:
-        containers_list: host_containers.stdout
+        containers_list: "{{ host_containers.stdout }}"
 
     - name: Fail if no containers match given regex
       vars:
         hotfix_containers: "{{ containers_list | split('\n') | regex_search(container_hotfix_container_regex) }}"
       fail:
-        msg: "No containers matched. Please check your regex. Containers running on host: {{ host_containers | split('\n') }}"
+        msg: "No containers matched. Please check your regex. Containers running on host: {{ host_containers.stdout_lines }}"
       when: hotfix_containers == ""
 
     - name: Ensure hotfix-files directory exists on the remote host
diff --git a/etc/kayobe/ansible/run-container-hotfix.yml b/etc/kayobe/ansible/run-container-hotfix.yml
index 582ade5dac..de652e451d 100644
--- a/etc/kayobe/ansible/run-container-hotfix.yml
+++ b/etc/kayobe/ansible/run-container-hotfix.yml
@@ -20,3 +20,4 @@
 
 - name: Run container_hotfix_command
   command: "{{ kolla_container_engine | default('docker')}} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
+  when: container_hotfix_command