diff --git a/.github/actions/configure-cmake/action.yaml b/.github/actions/configure-cmake/action.yaml
index c1148acc9..7f23fd5c1 100644
--- a/.github/actions/configure-cmake/action.yaml
+++ b/.github/actions/configure-cmake/action.yaml
@@ -47,14 +47,6 @@ runs:
         # Source the container entrypoint script
         . /entrypoint.sh
 
-        # Load Spack-installed GCC if necessary
-        # FIXME: The entrypoint.sh script should include the adjustment of PATH
-        #        such that $(which g++) refers to the Spack-installed GCC.
-        if [ "$CPP_COMPILER" == "g++" ]; then
-          spack load gcc@15.2
-          CPP_COMPILER=$(which g++)
-        fi
-
         cd "$GITHUB_WORKSPACE/$BUILD_PATH"
         SOURCE_DIR="$GITHUB_WORKSPACE/$SOURCE_PATH"
         echo "Configuring with CMake preset: $PRESET"
diff --git a/.github/workflows/cmake-build.yaml b/.github/workflows/cmake-build.yaml
index dcba5940f..9c48ce72a 100644
--- a/.github/workflows/cmake-build.yaml
+++ b/.github/workflows/cmake-build.yaml
@@ -217,7 +217,7 @@ jobs:
 
     - name: Configure CMake
       id: configure
-      uses: Framework-R-D/phlex/.github/actions/configure-cmake@main
+      uses: knoepfel/phlex/.github/actions/configure-cmake@update-container
       with:
         source-path: ${{ env.local_checkout_path }}
         build-path: ${{ env.local_build_path }}
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 9b027cab7..3b6087e7c 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -42,6 +42,7 @@ apt-get install -y --no-install-recommends \
   git \
   gnupg2 \
   libcurl4-openssl-dev \
+  libssl-dev \
   locales-all \
   python3 \
   python3-dev \
@@ -161,7 +162,7 @@ set -euo pipefail
 . /spack/share/spack/setup-env.sh
 
 spack --timestamp install --fail-fast -j $parallelism -p 1 \
-  --no-check-signature gcc@15.2 target=x86_64_v3
+  --no-check-signature gcc@15.2 target=x86_64_v3 %c,cxx=gcc@13
 
 # Make GCC external to simplify concretization
 spack compiler find $(spack location -i gcc@15.2)
diff --git a/ci/entrypoint.sh b/ci/entrypoint.sh
index fa1a8b85a..96883e742 100644
--- a/ci/entrypoint.sh
+++ b/ci/entrypoint.sh
@@ -8,3 +8,4 @@ export SPACK_DISABLE_LOCAL_CONFIG=true
 
 . /spack/share/spack/setup-env.sh
 spack env activate -d "$PHLEX_SPACK_ENV"
+PATH=$(spack -E location -i gcc@15 %c,cxx=gcc@13)/bin:$PATH
diff --git a/ci/spack.yaml b/ci/spack.yaml
index 04e95090a..17956a10f 100644
--- a/ci/spack.yaml
+++ b/ci/spack.yaml
@@ -48,8 +48,4 @@ spack:
     root:
       require:
       - "~x"  # No graphics libraries required
-      # FIXME: davix requires openssl headers which are not currently
-      #        available in the container.  They are also not needed
-      #        for Phlex development.  This should be rectified.
-      - "~davix"
       - "cxxstd=23"