diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index 1f6fa3afcd..ed0b1a67c1 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -9,9 +9,9 @@ defaults:
 
 env:
   cache_key: gcc
-  CC: gcc-10
-  FC: gfortran-10
-  CXX: g++-10
+  CC: gcc-12
+  FC: gfortran-12
+  CXX: g++-12
 
 # The jobs are split into:
 # 1. a dependency build step (setup), and
diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
index d21420687a..4cf0abf129 100644
--- a/.github/workflows/intel.yml
+++ b/.github/workflows/intel.yml
@@ -34,7 +34,8 @@ jobs:
           sudo swapoff -a
           sudo rm -f /swapfile
           sudo apt clean
-          docker rmi $(docker image ls -aq)
+          DOCKER_IMGS=$(docker image ls -aq)
+          [[ ! -z "${DOCKER_IMGS}" ]] && docker rmi ${DOCKER_IMGS}
 
       # Checkout the GSI to get the ci/spack.yaml file
       - name: checkout