diff --git a/Ansible/roles/cloudstack-manager/tasks/centos8.yml b/Ansible/roles/cloudstack-manager/tasks/centos8.yml
index f0c550eb541..877f9419353 100644
--- a/Ansible/roles/cloudstack-manager/tasks/centos8.yml
+++ b/Ansible/roles/cloudstack-manager/tasks/centos8.yml
@@ -100,3 +100,7 @@
 #- name: Open 8096 when Marvin is required (CentOS 7)
 #  shell: firewall-cmd --permanent --zone=public --add-port=8096/tcp && firewall-cmd --reload
 #  when: (num_marv_hosts > 0) and (ansible_distribution_major_version == "7")
+
+# Workaround for https://github.com/apache/cloudstack/issues/4204
+- name: Patch ipmitool yo ipmitool-1.8.18-12.el8_1.x86_64.rpm
+  shell: "rpm -i https://rpmfind.net/linux/centos/8.1.1911/AppStream/x86_64/os/Packages/ipmitool-1.8.18-12.el8_1.x86_64.rpm --force"
diff --git a/Ansible/roles/kvm/tasks/centos8.yml b/Ansible/roles/kvm/tasks/centos8.yml
index c278834e355..d4795abc6b7 100644
--- a/Ansible/roles/kvm/tasks/centos8.yml
+++ b/Ansible/roles/kvm/tasks/centos8.yml
@@ -101,6 +101,13 @@
     enabled=yes
   when: ( ansible_distribution_major_version|int >= 7 ) and use_firewalld
 
+- name: Stop firewalld CentOS7/8
+  service:
+    name=firewalld
+    state=stopped
+    enabled=no
+  when: ( ansible_distribution_major_version|int >= 7 ) and (use_firewalld|bool == False)
+
 - include: ./add_local_storage.yml
   when: use_local_storage
   tags:
diff --git a/Ansible/roles/timezone/tasks/main.yml b/Ansible/roles/timezone/tasks/main.yml
index 111bacdd51c..79e1ca366ee 100644
--- a/Ansible/roles/timezone/tasks/main.yml
+++ b/Ansible/roles/timezone/tasks/main.yml
@@ -16,7 +16,7 @@
   when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version == "6" )
 
 - include: ./centos7.yml
-  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version == "7" )
+  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int >= 7 )
 
 - include: ./ubuntu.yml
   when: ansible_distribution == 'Ubuntu'