diff --git a/roles/ipa/server/files/389-ds.module b/roles/ipa/server/files/389-ds.module
new file mode 100644
index 0000000000..8c81f9b53d
--- /dev/null
+++ b/roles/ipa/server/files/389-ds.module
@@ -0,0 +1,5 @@
+[389-ds]
+name=389-ds
+stream=1.4
+profiles=
+state=enabled
diff --git a/roles/ipa/server/files/idm.module b/roles/ipa/server/files/idm.module
new file mode 100644
index 0000000000..49374a4353
--- /dev/null
+++ b/roles/ipa/server/files/idm.module
@@ -0,0 +1,5 @@
+[idm]
+name=idm
+stream=DL1
+profiles=
+state=enabled
diff --git a/roles/ipa/server/files/pki-core.module b/roles/ipa/server/files/pki-core.module
new file mode 100644
index 0000000000..52b48ae902
--- /dev/null
+++ b/roles/ipa/server/files/pki-core.module
@@ -0,0 +1,5 @@
+[pki-core]
+name=pki-core
+stream=10.6
+profiles=
+state=enabled
diff --git a/roles/ipa/server/files/pki-deps.module b/roles/ipa/server/files/pki-deps.module
new file mode 100644
index 0000000000..d2da0a771c
--- /dev/null
+++ b/roles/ipa/server/files/pki-deps.module
@@ -0,0 +1,5 @@
+[pki-deps]
+name=pki-deps
+stream=10.6
+profiles=
+state=enabled
diff --git a/roles/ipa/server/tasks/main.yml b/roles/ipa/server/tasks/main.yml
index 7d53c10ff2..a20088da0c 100644
--- a/roles/ipa/server/tasks/main.yml
+++ b/roles/ipa/server/tasks/main.yml
@@ -4,14 +4,17 @@
 # TODO: remove staging tag afetr freeze
 - name: on rhel8 hosts enable the correct idm module
   copy:
-    dest: /etc/dnf/modules.d/idm.module
-    content: |
-      [idm]
-      name=idm
-      stream=DL1
-      profiles=
-      state=enabled
+    src: "{{item}}"
+    dest: /etc/dnf/modules.d/{{item}}
+  with_items:
+    - 389-ds.module
+    - idm.module
+    - pki-core.module
+    - pki-deps.module
   when: ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat' and env == 'staging'
+  tags:
+  - ipa/server
+  - config
 
 # TODO: consider switching to https://github.com/freeipa/ansible-freeipa
 - name: install needed packages