diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.3.2-GCC-10.2.0.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.3.2-GCC-10.2.0.eb
index 9c3d7a9f5960..0b28d5921b68 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-3.3.2-GCC-10.2.0.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.3.2-GCC-10.2.0.eb
@@ -7,7 +7,7 @@ of the Message Passing Interface (MPI) standard (MPI-1, MPI-2 and MPI-3)."""
 
 toolchain = {'name': 'GCC', 'version': '10.2.0'}
 
-source_urls = ['https://www.mpich.org/static/tarballs/%(version)s']
+source_urls = ['https://www.mpich.org/static/downloads/%(version)s']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['4bfaf8837a54771d3e4922c84071ef80ffebddbb6971a006038d91ee7ef959b9']
 
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.4.2-GCC-10.3.0.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.4.2-GCC-10.3.0.eb
index b98ff99d2e91..1771e70df611 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-3.4.2-GCC-10.3.0.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.4.2-GCC-10.3.0.eb
@@ -7,14 +7,14 @@ of the Message Passing Interface (MPI) standard (MPI-1, MPI-2 and MPI-3)."""
 
 toolchain = {'name': 'GCC', 'version': '10.3.0'}
 
-source_urls = ['https://www.mpich.org/static/tarballs/%(version)s']
+source_urls = ['https://www.mpich.org/static/downloads/%(version)s']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['5c19bea8b84e8d74cca5f047e82b147ff3fba096144270e3911ad623d6c587bf']
 
-configopts = 'FFLAGS="-w -fallow-argument-mismatch -O2" --with-devices=ch4:ucx --with-ucx=$EBROOTUCX'
-
 dependencies = [
     ('UCX', '1.10.0'),
 ]
 
+configopts = 'FFLAGS="-w -fallow-argument-mismatch -O2" --with-device=ch4:ucx --with-ucx=$EBROOTUCX'
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-4.2.1-GCC-12.3.0.eb b/easybuild/easyconfigs/m/MPICH/MPICH-4.2.1-GCC-12.3.0.eb
index 09347a1cef3e..023cbffaad9c 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-4.2.1-GCC-12.3.0.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-4.2.1-GCC-12.3.0.eb
@@ -11,10 +11,10 @@ source_urls = ['https://www.mpich.org/static/downloads/%(version)s']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7']
 
-configopts = 'FFLAGS="-w -fallow-argument-mismatch -O2" --with-devices=ch4:ucx --with-ucx=$EBROOTUCX'
-
 dependencies = [
     ('UCX', '1.14.1'),
 ]
 
+configopts = 'FFLAGS="-w -fallow-argument-mismatch -O2" --with-device=ch4:ucx --with-ucx=$EBROOTUCX'
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-4.2.2-GCC-13.3.0.eb b/easybuild/easyconfigs/m/MPICH/MPICH-4.2.2-GCC-13.3.0.eb
index 9ff674c80992..c2f6c1a76abf 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-4.2.2-GCC-13.3.0.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-4.2.2-GCC-13.3.0.eb
@@ -15,7 +15,6 @@ dependencies = [
     ('UCX', '1.16.0'),
 ]
 
-configopts = 'FFLAGS="-w -fallow-argument-mismatch -O2" --with-devices=ch4:ucx --with-ucx=$EBROOTUCX'
-
+configopts = 'FFLAGS="-w -fallow-argument-mismatch -O2" --with-device=ch4:ucx --with-ucx=$EBROOTUCX'
 
 moduleclass = 'mpi'