diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb
index b82c542c424..ec897b5c4c1 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb
@@ -13,16 +13,18 @@ patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
     'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    '228467c3dd15339d9b26cf26a291af3ee7c770699c5e8a1b3ad786f9ae78140a',  # openmpi-4.1.0.tar.gz
-    # OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch
-    'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e',
-    # OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch
-    'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb',
-    '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
-    # OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch
-    'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea',
+    {'openmpi-4.1.0.tar.gz': '228467c3dd15339d9b26cf26a291af3ee7c770699c5e8a1b3ad786f9ae78140a'},
+    {'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch':
+     'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e'},
+    {'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch':
+     'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb'},
+    {'OpenMPI-4.x_fix_pmix_discovery.patch': '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b'},
+    {'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch':
+     'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb
index 5314ed77d40..415e81332a2 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb
@@ -17,19 +17,21 @@ patches = [
     'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch',
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda',  # openmpi-4.1.1.tar.bz2
-    # OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch
-    'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e',
-    # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch
-    '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d',
-    # OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch
-    'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea',
-    # OpenMPI-4.1.1_build-with-internal-cuda-header.patch
-    '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83',
-    # OpenMPI-4.1.1_opal-datatype-cuda-performance.patch
-    'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e',
+    {'openmpi-4.1.1.tar.bz2': 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda'},
+    {'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch':
+     'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e'},
+    {'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch':
+     '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d'},
+    {'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch':
+     'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea'},
+    {'OpenMPI-4.1.1_build-with-internal-cuda-header.patch':
+     '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
+    {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
+     'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index 762189ad19d..3cafd8e33fe 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -16,21 +16,23 @@ patches = [
     'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch',
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda',  # openmpi-4.1.1.tar.bz2
-    # OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch
-    'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e',
-    # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch
-    '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d',
-    '04353672cf7be031e5306c94068d7012d99e6cd94b69d93230797ffcd7f31903',  # OpenMPI-4.1.1_opal-pmix-package-rank.patch
-    '384ef9f1fa803b0d71dae2ec0748d0f20295992437532afedf21478bda164ff8',  # OpenMPI-4.1.1_pmix3x-protection.patch
-    # OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch
-    'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea',
-    # OpenMPI-4.1.1_build-with-internal-cuda-header.patch
-    '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83',
-    # OpenMPI-4.1.1_opal-datatype-cuda-performance.patch
-    'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e',
+    {'openmpi-4.1.1.tar.bz2': 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda'},
+    {'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch':
+     'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e'},
+    {'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch':
+     '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d'},
+    {'OpenMPI-4.1.1_opal-pmix-package-rank.patch': '04353672cf7be031e5306c94068d7012d99e6cd94b69d93230797ffcd7f31903'},
+    {'OpenMPI-4.1.1_pmix3x-protection.patch': '384ef9f1fa803b0d71dae2ec0748d0f20295992437532afedf21478bda164ff8'},
+    {'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch':
+     'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea'},
+    {'OpenMPI-4.1.1_build-with-internal-cuda-header.patch':
+     '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
+    {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
+     'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.2.0.eb
index 523bf0bb069..0df727a62a3 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.2.0.eb
@@ -15,15 +15,17 @@ patches = [
     'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch',
     'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda',  # openmpi-4.1.1.tar.bz2
-    # OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch
-    'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e',
-    # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch
-    '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d',
-    # OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch
-    'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea',
+    {'openmpi-4.1.1.tar.bz2': 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda'},
+    {'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch':
+     'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e'},
+    {'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch':
+     '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d'},
+    {'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch':
+     'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
index 6e354371c1c..55381169f03 100755
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
@@ -14,20 +14,21 @@ patches = [
     'OpenMPI-4.1.1_opal-pmix-package-rank.patch',
     'OpenMPI-4.1.1_pmix3x-protection.patch',
     'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda',  # openmpi-4.1.1.tar.bz2
-    # OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch
-    'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e',
-    # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch
-    '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d',
-    '04353672cf7be031e5306c94068d7012d99e6cd94b69d93230797ffcd7f31903',  # OpenMPI-4.1.1_opal-pmix-package-rank.patch
-    '384ef9f1fa803b0d71dae2ec0748d0f20295992437532afedf21478bda164ff8',  # OpenMPI-4.1.1_pmix3x-protection.patch
-    # OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch
-    'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea',
+    {'openmpi-4.1.1.tar.bz2': 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda'},
+    {'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch':
+     'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e'},
+    {'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch':
+     '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d'},
+    {'OpenMPI-4.1.1_opal-pmix-package-rank.patch': '04353672cf7be031e5306c94068d7012d99e6cd94b69d93230797ffcd7f31903'},
+    {'OpenMPI-4.1.1_pmix3x-protection.patch': '384ef9f1fa803b0d71dae2ec0748d0f20295992437532afedf21478bda164ff8'},
+    {'OpenMPI-4.1.0-1-pml-ucx-datatype-memleak.patch':
+     'a94a74b174ce783328abfd3656ff5196b89ef4c819fe4c8b8a0f1277123e76ea'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
-
 builddependencies = [
     ('pkg-config', '0.29.2'),
 ]
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb
index 5148de10aa7..d0d18bc3a0b 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb
@@ -8,7 +8,11 @@ toolchain = {'name': 'GCC', 'version': '10.2.0'}
 
 source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
+patches = ['OpenMPI-4.1.x_add_atomic_wmb.patch']
+checksums = [
+    {'openmpi-4.1.2.tar.bz2': '9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
+]
 
 builddependencies = [
     ('pkg-config', '0.29.2'),
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
index 65660f70e15..eebd0204a24 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
@@ -8,7 +8,11 @@ toolchain = {'name': 'GCC', 'version': '11.2.0'}
 
 source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
+patches = ['OpenMPI-4.1.x_add_atomic_wmb.patch']
+checksums = [
+    {'openmpi-4.1.2.tar.bz2': '9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
+]
 
 builddependencies = [
     ('pkgconf', '1.8.0'),
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
index 524393cf31b..6471a45d999 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
@@ -11,13 +11,15 @@ sources = [SOURCELOWER_TAR_BZ2]
 patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    '92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d',  # openmpi-4.1.4.tar.bz2
-    # OpenMPI-4.1.1_build-with-internal-cuda-header.patch
-    '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83',
-    # OpenMPI-4.1.1_opal-datatype-cuda-performance.patch
-    'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e',
+    {'openmpi-4.1.4.tar.bz2': '92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d'},
+    {'OpenMPI-4.1.1_build-with-internal-cuda-header.patch':
+     '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
+    {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
+     'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
index 09a6bc393d3..fbb50478eec 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
@@ -11,13 +11,15 @@ sources = [SOURCELOWER_TAR_BZ2]
 patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    '92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d',  # openmpi-4.1.4.tar.bz2
-    # OpenMPI-4.1.1_build-with-internal-cuda-header.patch
-    '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83',
-    # OpenMPI-4.1.1_opal-datatype-cuda-performance.patch
-    'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e',
+    {'openmpi-4.1.4.tar.bz2': '92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d'},
+    {'OpenMPI-4.1.1_build-with-internal-cuda-header.patch':
+     '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
+    {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
+     'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
index 34c4551c73e..9ef5b5d1bb4 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
@@ -11,13 +11,15 @@ sources = [SOURCELOWER_TAR_BZ2]
 patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
-    '92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d',  # openmpi-4.1.4.tar.bz2
-    # OpenMPI-4.1.1_build-with-internal-cuda-header.patch
-    '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83',
-    # OpenMPI-4.1.1_opal-datatype-cuda-performance.patch
-    'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e',
+    {'openmpi-4.1.4.tar.bz2': '92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d'},
+    {'OpenMPI-4.1.1_build-with-internal-cuda-header.patch':
+     '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
+    {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
+     'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.2.0.eb
index 634b2a2f67b..3ff4b9d8e66 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.2.0.eb
@@ -11,6 +11,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
     {'openmpi-4.1.5.tar.bz2': 'a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3'},
@@ -18,6 +19,7 @@ checksums = [
      '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
     {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
      'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.3.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.3.0.eb
index 6279c1af7bd..797e9c0f0de 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-12.3.0.eb
@@ -12,6 +12,7 @@ patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
     'OpenMPI-4.1.5_fix-pmix3x.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
     {'openmpi-4.1.5.tar.bz2': 'a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3'},
@@ -19,8 +20,8 @@ checksums = [
      '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
     {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
      'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
-    {'OpenMPI-4.1.5_fix-pmix3x.patch':
-     '46edac3dbf32f2a611d45e8a3c8edd3ae2f430eec16a1373b510315272115c40'},
+    {'OpenMPI-4.1.5_fix-pmix3x.patch': '46edac3dbf32f2a611d45e8a3c8edd3ae2f430eec16a1373b510315272115c40'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-intel-compilers-2023.1.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-intel-compilers-2023.1.0.eb
index 4d79ac0d55a..59780f6df6e 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-intel-compilers-2023.1.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-intel-compilers-2023.1.0.eb
@@ -12,6 +12,7 @@ patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
     'OpenMPI-4.1.5_fix-pmix3x.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
     {'openmpi-4.1.5.tar.bz2': 'a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3'},
@@ -19,8 +20,8 @@ checksums = [
      '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
     {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
      'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
-    {'OpenMPI-4.1.5_fix-pmix3x.patch':
-     '46edac3dbf32f2a611d45e8a3c8edd3ae2f430eec16a1373b510315272115c40'},
+    {'OpenMPI-4.1.5_fix-pmix3x.patch': '46edac3dbf32f2a611d45e8a3c8edd3ae2f430eec16a1373b510315272115c40'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.6-GCC-13.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.6-GCC-13.2.0.eb
index 3e4baa87735..831148339ac 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.6-GCC-13.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.6-GCC-13.2.0.eb
@@ -11,6 +11,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 patches = [
     'OpenMPI-4.1.1_build-with-internal-cuda-header.patch',
     'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch',
+    'OpenMPI-4.1.x_add_atomic_wmb.patch',
 ]
 checksums = [
     {'openmpi-4.1.6.tar.bz2': 'f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415'},
@@ -18,6 +19,7 @@ checksums = [
      '63eac52736bdf7644c480362440a7f1f0ae7c7cae47b7565f5635c41793f8c83'},
     {'OpenMPI-4.1.1_opal-datatype-cuda-performance.patch':
      'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e'},
+    {'OpenMPI-4.1.x_add_atomic_wmb.patch': '9494bbc546d661ba5189e44b4c84a7f8df30a87cdb9d96ce2e73a7c8fecba172'},
 ]
 
 builddependencies = [