diff --git a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
index 6a24c0e19..7d5f4b59e 100644
--- a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
+++ b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
@@ -534,11 +534,6 @@ ifeval::["{build}" != "downstream"]
           curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz
           python3 -m venv ./venv
           PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main
-          # This is required for FIPS enabled until trunk.rdoproject.org
-          # is not being served from a centos7 host, tracked by
-          # https://issues.redhat.com/browse/RHOSZUUL-1517
-          sudo dnf -y install crypto-policies
-          sudo update-crypto-policies --set FIPS:NO-ENFORCE-EMS
           sudo ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
           sudo dnf -y upgrade openstack-selinux
           sudo rm -f /run/virtlogd.pid
diff --git a/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc
index 11d45bdeb..bf6f54e49 100644
--- a/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc
+++ b/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc
@@ -239,11 +239,6 @@ ifeval::["{build}" != "downstream"]
           curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz
           python3 -m venv ./venv
           PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main
-          # This is required for FIPS enabled until trunk.rdoproject.org
-          # is not being served from a centos7 host, tracked by
-          # https://issues.redhat.com/browse/RHOSZUUL-1517
-          sudo dnf -y install crypto-policies
-          sudo update-crypto-policies --set FIPS:NO-ENFORCE-EMS
           sudo ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
           sudo rm -rf repo-setup-main
 endif::[]
diff --git a/docs_user/modules/proc_converting-object-storage-nodes.adoc b/docs_user/modules/proc_converting-object-storage-nodes.adoc
index 2ce64cfc3..ec1642e8d 100644
--- a/docs_user/modules/proc_converting-object-storage-nodes.adoc
+++ b/docs_user/modules/proc_converting-object-storage-nodes.adoc
@@ -197,11 +197,6 @@ ifeval::["{build}" != "downstream"]
           curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz
           python3 -m venv ./venv
           PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main
-          # This is required for FIPS enabled until trunk.rdoproject.org
-          # is not being served from a centos7 host, tracked by
-          # https://issues.redhat.com/browse/RHOSZUUL-1517
-          sudo dnf -y install crypto-policies
-          sudo update-crypto-policies --set FIPS:NO-ENFORCE-EMS
           sudo ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
           sudo dnf -y upgrade openstack-selinux
           sudo rm -f /run/virtlogd.pid
diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
index d7f88de33..0da60d090 100644
--- a/tests/roles/dataplane_adoption/defaults/main.yaml
+++ b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -108,11 +108,6 @@ edpm_bootstrap_command: |
   curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz
   python3 -m venv ./venv
   PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main
-  # This is required for FIPS enabled until trunk.rdoproject.org
-  # is not being served from a centos7 host, tracked by
-  # https://issues.redhat.com/browse/RHOSZUUL-1517
-  dnf -y install crypto-policies
-  update-crypto-policies --set FIPS:NO-ENFORCE-EMS
   ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
   {%+ if compute_adoption|bool +%}
   # Exclude ceph-common-18.2.7|8|9 as it's pulling newer openssl not compatible
diff --git a/tests/roles/swift_conversion/defaults/main.yaml b/tests/roles/swift_conversion/defaults/main.yaml
index 511c86fd4..86e63931c 100644
--- a/tests/roles/swift_conversion/defaults/main.yaml
+++ b/tests/roles/swift_conversion/defaults/main.yaml
@@ -16,11 +16,6 @@ edpm_bootstrap_command: |
   curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz
   python3 -m venv ./venv
   PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main
-  # This is required for FIPS enabled until trunk.rdoproject.org
-  # is not being served from a centos7 host, tracked by
-  # https://issues.redhat.com/browse/RHOSZUUL-1517
-  dnf -y install crypto-policies
-  update-crypto-policies --set FIPS:NO-ENFORCE-EMS
   ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
   rm -rf repo-setup-main