diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 17f136b9fb..79710d7fd6 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1458,8 +1458,8 @@ outputs:
               - name: libvirt-guests enable VM shutdown on compute reboot/shutdown
                 systemd:
                   name: libvirt-guests
-                  enabled: yes
-                  daemon_reload: yes
+                  enabled: true
+                  daemon_reload: true
           - name: install tripleo_nova_libvirt_guests systemd unit file (podman)
             when:
               - resume_guests_state_on_host_boot_enabled|bool
@@ -1499,8 +1499,8 @@ outputs:
               - name: tripleo_nova_libvirt_guests enable VM shutdown on compute reboot/shutdown
                 systemd:
                   name: tripleo_nova_libvirt_guests
-                  enabled: yes
-                  daemon_reload: yes
+                  enabled: true
+                  daemon_reload: true
           - name: ensure ceph configurations exist
             file:
               path: {get_param: CephConfigPath}
@@ -1511,8 +1511,8 @@ outputs:
           - name: enable virt_sandbox_use_netlink for healthcheck
             seboolean:
               name: virt_sandbox_use_netlink
-              persistent: yes
-              state: yes
+              persistent: true
+              state: true
           - name: install Instance HA recovery script
             when: instance_ha_enabled|bool
             block:
@@ -1593,7 +1593,7 @@ outputs:
               service:
                 name: "{{ item }}"
                 state: stopped
-                enabled: no
+                enabled: false
               with_items:
                 - ksm.service
                 - ksmtuned.service
@@ -1623,7 +1623,7 @@ outputs:
               service:
                 name: "{{ item }}"
                 state: started
-                enabled: yes
+                enabled: true
               with_items:
                 - ksm.service
                 - ksmtuned.service
@@ -1660,7 +1660,7 @@ outputs:
               command: openstack compute service list --service nova-compute --column ID --column Host --format yaml
               register: nova_compute_service_result
               delegate_to: localhost
-              check_mode: no
+              check_mode: false
               changed_when: false
             - name: is additional Cell?
               set_fact:
@@ -1669,7 +1669,7 @@ outputs:
               set_fact:
                 nova_compute_service: "{{ nova_compute_service_result.stdout | from_yaml | selectattr('Host', 'match', ansible_facts['fqdn'] ~ '.*') | list }}"
               delegate_to: localhost
-              check_mode: no
+              check_mode: false
             - name: Check search output
               fail:
                 msg: >-
@@ -1688,16 +1688,16 @@ outputs:
                 - name: Disable nova-compute service
                   command: openstack compute service set {{ nova_compute_service[0].Host }} nova-compute --disable
                   delegate_to: localhost
-                  check_mode: no
+                  check_mode: false
                   when:
                     - not is_additional_cell|bool
                 - name: Stop nova-compute container
                   service:
                     name: tripleo_nova_compute
                     state: stopped
-                    enabled: no
+                    enabled: false
                   become: true
                 - name: Delete nova-compute service
                   command: openstack compute service delete {{ nova_compute_service[0].ID }}
                   delegate_to: localhost
-                  check_mode: no
+                  check_mode: false