diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed27dd2d1a711c9ff76fe40b5f0cdb39feb1e3af..9b7e1b6d5bea9a0cd7289b7105ed35fb0f55ee00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,25 +39,25 @@ stages:
 
 ## Basic builds
 
-el8-mpi-python:build:
+el8-python:build:
     extends:
-        - .el8_icc_mpi_python
+        - .el8_icc_python
         - .cmake_build_linux
         - .linux_builder_tags
         - .cmake_build_artifacts
         - .run_manually
 
-el8-mpi-python:test:
+el8-python:test:
     extends:
-        - .el8_icc_mpi_python
+        - .el8_icc_python
         - .cmake_test_linux
         - .linux_qt_tester_tags
         - .cmake_test_artifacts
         - .run_automatically
     dependencies:
-        - el8-mpi-python:build
+        - el8-python:build
     needs:
-        - el8-mpi-python:build
+        - el8-python:build
 
 fedora34-mpi-renderless:build:
     extends:
diff --git a/.gitlab/ci/cdash-groups.json b/.gitlab/ci/cdash-groups.json
index 370103a7dac32bed59f28ad589fd4c523b935512..90b32e4e8412bd6ba428b350ba4ed92e13abfb37 100644
--- a/.gitlab/ci/cdash-groups.json
+++ b/.gitlab/ci/cdash-groups.json
@@ -3,7 +3,7 @@
         {
             "group": "master",
             "site": "gitlab-ci",
-            "buildname": "[el8_icc_mpi_python]"
+            "buildname": "[el8_icc_python]"
         },
         {
             "group": "master",
diff --git a/.gitlab/ci/configure_el8_icc_mpi_python.cmake b/.gitlab/ci/configure_el8_icc_python.cmake
similarity index 100%
rename from .gitlab/ci/configure_el8_icc_mpi_python.cmake
rename to .gitlab/ci/configure_el8_icc_python.cmake
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 1a7229001ef7fc864de987770fcc385cd5bdbfae..5a40721e161740f18d188a8cc778f06bb3f1cffc 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -83,19 +83,12 @@
         OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
         MODULES: mpi/openmpi-x86_64
 
-.el8_intelmpi_addon:
-    variables:
-        CMAKE_PREFIX_PATH: /usr/local/intelmpi
-        # Disable shared memory; it doesn't work so well inside of containers.
-        I_MPI_SHM: disable
-
-.el8_icc_mpi_python:
+.el8_icc_python:
     extends:
         - .el8_icc
-        - .el8_intelmpi_addon
 
     variables:
-        CMAKE_CONFIGURATION: el8_icc_mpi_python
+        CMAKE_CONFIGURATION: el8_icc_python
 
 .fedora34_doxygen_mpi_python_qt_tbb:
     extends: