diff --git a/common/common-container-config-scripts.yaml b/common/common-container-config-scripts.yaml
index f4fa1cb3b9..95b50cb56a 100644
--- a/common/common-container-config-scripts.yaml
+++ b/common/common-container-config-scripts.yaml
@@ -1,5 +1,5 @@
 - name: Create fcontext entry for container-config-scripts
-  sefcontext:
+  community.general.sefcontext:
     target: "/var/lib/container-config-scripts(/.*)?"
     setype: container_file_t
     state: present
diff --git a/common/deploy-steps-tasks-step-0.j2.yaml b/common/deploy-steps-tasks-step-0.j2.yaml
index 439e9ad4ec..a2c887050a 100644
--- a/common/deploy-steps-tasks-step-0.j2.yaml
+++ b/common/deploy-steps-tasks-step-0.j2.yaml
@@ -13,7 +13,7 @@
   become: true
   register: cloud_init_enabled
 - name: Wait for cloud-init to finish, if enabled
-  cloud_init_data_facts:
+  community.general.cloud_init_data_facts:
     filter: status
   register: res
   until: >
diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml
index 6eb13df76f..2cefbf69b5 100644
--- a/deployment/cinder/cinder-common-container-puppet.yaml
+++ b/deployment/cinder/cinder-common-container-puppet.yaml
@@ -132,7 +132,7 @@ outputs:
     description: Common host prep tasks for cinder-volume and cinder-backup services
     value: &cinder_common_host_prep_tasks
       - name: create fcontext entry for cinder data
-        sefcontext:
+        community.general.sefcontext:
           target: "/var/lib/cinder(/.*)?"
           setype: container_file_t
           state: present
@@ -259,7 +259,7 @@ outputs:
                 changed_when: _loopback_device.rc == 2
                 failed_when: _loopback_device.rc not in [0,2]
               - name: Create LVM volume group
-                lvg:
+                community.general.lvg:
                   vg: "cinder-volumes"
                   pvs: "{{ _loopback_device.stdout }}"
                   state: present
diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml
index 8b20f3cd58..7f80b16e1f 100644
--- a/deployment/database/mysql-container-puppet.yaml
+++ b/deployment/database/mysql-container-puppet.yaml
@@ -250,7 +250,7 @@ outputs:
         get_attr: [MysqlBase, role_data, deploy_steps_tasks]
       host_prep_tasks:
         - name: create fcontext entry for mysql data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/mysql(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml
index 74354b58c2..fe443cba14 100644
--- a/deployment/database/redis-container-puppet.yaml
+++ b/deployment/database/redis-container-puppet.yaml
@@ -236,7 +236,7 @@ outputs:
       external_deploy_tasks: {get_attr: [RedisBase, role_data, external_deploy_tasks]}
       host_prep_tasks:
         - name: create fcontext entry for redis data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/run/redis(/.*)?" # conflicts with equivalency rule '/run /var/run' - have to use /var/run here...
             setype: container_file_t
             state: present
diff --git a/deployment/image-serve/image-serve-baremetal-ansible.yaml b/deployment/image-serve/image-serve-baremetal-ansible.yaml
index 7655d03796..2ee19dcde6 100644
--- a/deployment/image-serve/image-serve-baremetal-ansible.yaml
+++ b/deployment/image-serve/image-serve-baremetal-ansible.yaml
@@ -47,7 +47,7 @@ outputs:
             - 13787
       host_prep_tasks:
         - name: authorize httpd to listen on registry ports
-          seport:
+          community.general.seport:
             ports:
               - '8787'
               - '13787'
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index 784e51ff23..d8996676db 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -578,7 +578,7 @@ outputs:
             modules:
               - name: iscsi_tcp
         - name: create fcontext entry for ironic data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/ironic(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index d9b50e963f..9f26cdc14f 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -516,7 +516,7 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create fcontext entry for ironic-inspector data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/ironic-inspector/dhcp-hostsdir(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml
index b2661428b9..6792acf3d6 100644
--- a/deployment/iscsid/iscsid-container-puppet.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@@ -153,7 +153,7 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create fcontext entry for iscsi
-          sefcontext:
+          community.general.sefcontext:
             target: "{{ item.path }}(/.*)?"
             setype: "{{ item.setype }}"
             state: present
diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml
index 1708153dd5..95a9e710d3 100644
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@@ -177,7 +177,7 @@ outputs:
             environment: {get_attr: [ManilaShareCommon, manila_share_environment]}
       host_prep_tasks:
         - name: create fcontext entry for manila data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/manila(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml
index 6e5b4d4188..ddd305f437 100644
--- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml
+++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml
@@ -139,7 +139,7 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
       - name: create fcontext entry for qdrouterd data
-        sefcontext:
+        community.general.sefcontext:
           target: "/var/lib/qdrouterd(/.*)?"
           setype: container_file_t
           state: present
diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index a91748bf9b..17b81c8f05 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -229,7 +229,7 @@ outputs:
                 cluster_recreate: "{{ tripleo_transfer_flag_stat.stat.exists|bool }}"
             - name: Check pacemaker cluster running before upgrade
               tags: validation
-              pacemaker_cluster: state=online check_and_fail=true
+              community.general.pacemaker_cluster: state=online check_and_fail=true
               async: 30
               poll: 4
               when: not cluster_recreate|bool
@@ -305,13 +305,13 @@ outputs:
           when: step|int == 2
           block:
             - name: Stop pacemaker cluster
-              pacemaker_cluster: state=offline
+              community.general.pacemaker_cluster: state=offline
               when: not cluster_recreate|bool
         - name: upgrade step 4
           when: step|int == 4
           block:
             - name: Start pacemaker cluster
-              pacemaker_cluster: state=online
+              community.general.pacemaker_cluster: state=online
               when: not cluster_recreate|bool
       external_upgrade_tasks:
         - when:
@@ -334,7 +334,7 @@ outputs:
       update_tasks:
         - name: Check pacemaker cluster running before the minor update
           when: step|int == 0  # TODO(marios) disabling validations?
-          pacemaker_cluster: state=online check_and_fail=true
+          community.general.pacemaker_cluster: state=online check_and_fail=true
           async: 30
           poll: 4
         - name: Move virtual IPs to another node before stopping pacemaker
@@ -364,10 +364,10 @@ outputs:
           command: systemd-cat -t ha-shutdown /var/lib/container-config-scripts/pacemaker_mutex_shutdown.sh --acquire
         - name: Stop pacemaker cluster
           when: step|int == 1
-          pacemaker_cluster: state=offline
+          community.general.pacemaker_cluster: state=offline
         - name: Start pacemaker cluster
           when: step|int == 4
-          pacemaker_cluster: state=online
+          community.general.pacemaker_cluster: state=online
         - name: Release the cluster shutdown lock
           when: step|int == 4
           command: systemd-cat -t ha-shutdown /var/lib/container-config-scripts/pacemaker_mutex_shutdown.sh --release
diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml
index 44f7d2820e..e687b00a75 100644
--- a/deployment/podman/podman-baremetal-ansible.yaml
+++ b/deployment/podman/podman-baremetal-ansible.yaml
@@ -209,7 +209,7 @@ outputs:
                 path: /usr/sbin/pcs
               register: pcs_stat
             - name: Stop pacemaker cluster before stopping all docker containers
-              pacemaker_cluster: state=offline
+              community.general.pacemaker_cluster: state=offline
               when: pcs_stat.stat.exists
             - name: Destroy pacemaker cluster
               command: /usr/sbin/pcs cluster destroy
diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml
index 65822c5d70..1489f94404 100644
--- a/deployment/qdr/qdrouterd-container-puppet.yaml
+++ b/deployment/qdr/qdrouterd-container-puppet.yaml
@@ -129,7 +129,7 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
       - name: create fcontext entry for qrouterd data
-        sefcontext:
+        community.general.sefcontext:
           target: "/var/lib/qdrouterd(/.*)?"
           setype: container_file_t
           state: present
diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml
index 8a06dd32ad..357bd1f80b 100644
--- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml
@@ -393,7 +393,7 @@ outputs:
                     ca: ipa
       host_prep_tasks:
         - name: creat fcontext entry for rabbitmq data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/rabbitmq(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
index 3ed7129d24..7825559fe8 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
@@ -311,7 +311,7 @@ outputs:
                     ca: ipa
       host_prep_tasks:
         - name: create fcontext for rabbitmq data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/rabbitmq(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index bdf42c2e95..e81c9fd32b 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -214,7 +214,7 @@ outputs:
               TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create fcontext for rabbitmq data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/rabbitmq(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
index 222059310c..3202b090e9 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
@@ -311,7 +311,7 @@ outputs:
                     ca: ipa
       host_prep_tasks:
         - name: create fcontext for rabbitmq data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/rabbitmq(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 5a78a239c6..5ee3bc212f 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -216,7 +216,7 @@ outputs:
         get_attr: [RabbitmqBase, role_data, metadata_settings]
       host_prep_tasks:
         - name: create fcontext for rabbitmq data
-          sefcontext:
+          community.general.sefcontext:
             target: "/var/lib/rabbitmq(/.*)?"
             setype: container_file_t
             state: present
diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
index 3cb28e24d1..627c0a19cc 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -639,7 +639,7 @@ outputs:
             swift_raw_disks: "{{ hiera_output.stdout | from_json }}"
           when: use_node_data_lookup|bool
         - name: Format SwiftRawDisks
-          filesystem:
+          community.general.filesystem:
             fstype: xfs
             dev: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
             opts: -f -i size=1024