diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index c286adb375d282589f155c5681c872b1c5fe5d5b..a9241526da8961e1f2f5349573a5479f89c0c80b 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -8,7 +8,6 @@
 ## ========================================================================================
 
 
-
 FROM  intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04 AS oneapi
 
 
@@ -39,6 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
         file                                                            \
         build-essential                                                 \
         gdb                                                             \
+        gfortran                                                        \
         ghostscript                                                     \
         git                                                             \
         gnupg2                                                          \
@@ -142,6 +142,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror                   \
  && spack mirror add docker /var/cache/spack-mirror                     \
  && spack mirror list
 
+## This variable will change whenevery either spack.yaml or our spack package
+## overrides change, triggering a rebuild
+ARG CACHE_BUST="hash"
+ARG CACHE_NUKE=""
+
 ## Setup our custom environment and package overrides
 COPY spack $SPACK_ROOT/eic-spack
 RUN spack repo add --scope site "$SPACK_ROOT/eic-spack"                 \
@@ -152,10 +157,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack"                 \
  && spack env activate .                                                \
  && spack concretize
 
-## This variable will change whenevery either spack.yaml or our spack package
-## overrides change, triggering a rebuild
-ARG CACHE_BUST="hash"
-ARG CACHE_NUKE=""
 
 ## Now execute the main build (or fetch from cache if possible)
 ## note, no-check-signature is needed to allow the quicker signature-less
diff --git a/spack.yaml b/spack.yaml
index adfe9d37adfe9d68ff4c8f60f8ef14f3fcd47665..48650471bd914385839b1e04dd921b5c48f9845f 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -50,8 +50,8 @@ spack:
       paths:
         cc: /usr/bin/gcc
         cxx: /usr/bin/g++
-        f77: 
-        fc: 
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
       flags: {}
       operating_system: ubuntu18.04
       target: x86_64