diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index f03241b19f..2dfd4fe7fa 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -1,5 +1,5 @@
 ---
-- name: ntp pkgs
+- name: Install desired extra packages (yum)
   yum: state=present pkg={{ item }}
   with_items:
   - ntpdate
@@ -10,12 +10,33 @@
   tags:
   - packages
 
-- name: ntp pkgs
-  command: dnf install -y ntpdate ntp libsemanage-python libselinux-python
+- name: Install desired extra packages (dnf)
+  dnf: state=present pkg={{ item }}
+  with_items:
+  - ntpdate
+  - ntp
+  - libsemanage-python
+  - libselinux-python
   when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
   tags:
   - packages
 
+- name: remove some packages (yum)
+  yum: state=absent pkg={{ item }}
+  with_items:
+  - chrony
+  tags:
+  - packages
+  when: ansible_distribution_major_version|int < 22
+
+- name: remove some packages (dnf)
+  dnf: state=absent pkg={{ item }}
+  with_items:
+  - chrony
+  tags:
+  - packages
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
+
 - name: put step-tickers in place
   copy: src="{{ files }}/common/step-tickers" dest=/etc/ntp/step-tickers
   when: ansible_cmdline.ostree is not defined