diff --git a/.github/workflows/dockerfiles.yaml b/.github/workflows/dockerfiles.yaml
index d33e8696de..af9c8de21c 100644
--- a/.github/workflows/dockerfiles.yaml
+++ b/.github/workflows/dockerfiles.yaml
@@ -100,7 +100,7 @@ jobs:
           result: ${{ steps.dockerfile_list.outputs.dockerfilelist_matrix }}
         run: |
           echo ${result}
-          if [[ "${result}" == "" ]]; then
+          if [[ "${result}" == "[]" ]]; then
             printf "The matrix is empty, will not trigger next workflow.\n"
             echo "::set-output name=empty_matrix::true"       
           else
@@ -116,7 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         result: ${{ fromJson(needs.update.outputs.dockerfile_matrix) }}
-    if: ${{ needs.update.outputs.empty_matrix == 'false' }}
+    if: ${{ needs.update.outputs.empty_matrix == false }}
 
     name: "Build ${{ matrix.result.name }}"
     steps:
diff --git a/ubuntu/gcc/Dockerfile b/ubuntu/gcc/Dockerfile
new file mode 100644
index 0000000000..2089d2ecd4
--- /dev/null
+++ b/ubuntu/gcc/Dockerfile
@@ -0,0 +1,8 @@
+ARG ubuntu_version
+FROM ghcr.io/rse-radiuss/ubuntu:$ubuntu_version
+
+# Install gcc with spack
+ARG gcc_version
+ENV gcc_version=$gcc_version
+
+RUN spack install gcc@${gcc_version}
diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
new file mode 100644
index 0000000000..7dc5a724e4
--- /dev/null
+++ b/ubuntu/gcc/uptodate.yaml
@@ -0,0 +1,21 @@
+dockerbuild:
+  build_args:
+    gcc_version:
+      key: gcc
+      versions:
+       # Needs patch from spack https://github.com/spack/spack/pull/25945
+       # - "4.9.3"
+       - "7.3.0"
+       - "8.1.0"
+       - "9.4.0"
+       - "10.3.0"
+       - "11.2.0"
+
+    # Look for ubuntu versions for our base builds
+    ubuntu_version:
+      key: ubuntu
+      name: ghcr.io/rse-radiuss/ubuntu
+      type: container
+      startat: "20.04"
+      filter: 
+        - "^[0-9]+[.]04$"