diff --git a/.github/workflows/cfast.yml b/.github/workflows/cfast.yml
index 511580f..35ec4f3 100644
--- a/.github/workflows/cfast.yml
+++ b/.github/workflows/cfast.yml
@@ -11,9 +11,10 @@ jobs:
         container:
           - "fedora:36"
           - "fedora:37"
-          # - "fedora:38"
-          - "rockylinux:9"
+          - "fedora:38"
+          - "fedora:39"
           - "rockylinux:8"
+          - "rockylinux:9"
         cfast-version:
           - "7.0.1"
           - "7.1.0"
diff --git a/.github/workflows/fds.yml b/.github/workflows/fds.yml
index 81d26bf..48ff0c0 100644
--- a/.github/workflows/fds.yml
+++ b/.github/workflows/fds.yml
@@ -9,12 +9,12 @@ jobs:
     strategy:
       matrix:
         container:
-          # - "fedora:36"
+          - "fedora:36"
           - "fedora:37"
-          # - "fedora:38"
-          # - "fedora:39"
-          # - "rockylinux:9"
-          # - "rockylinux:8"
+          - "fedora:38"
+          - "fedora:39"
+          - "rockylinux:8"
+          - "rockylinux:9"
         fds-version:
           - "5.5.3"
           - "6.1.2"
diff --git a/.github/workflows/smv.yml b/.github/workflows/smv.yml
index 1d8108e..0e9fee5 100644
--- a/.github/workflows/smv.yml
+++ b/.github/workflows/smv.yml
@@ -12,8 +12,9 @@ jobs:
           - "fedora:36"
           - "fedora:37"
           - "fedora:38"
-         # - "rockylinux:8"
-         # - "rockylinux:9"
+          - "fedora:39"
+          - "rockylinux:8"
+          - "rockylinux:9"
     container: ${{ matrix.container }}
     steps:
       - uses: actions/checkout@v3
diff --git a/fds/template.spec b/fds/template.spec
index 7dfcd5c..da46c42 100644
--- a/fds/template.spec
+++ b/fds/template.spec
@@ -15,7 +15,7 @@
  module unload mkl; \
  module unload icc; \
  module unload compiler; \
- module unload mpi;
+ module unload mpi/latest;
 
 Name:           fds%{?version_suffix}
 Version:        %{this_version}