diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index dae47784ce..18734b71ab 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -13,10 +13,12 @@ on:
 jobs:
   linux:
     runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    env:
-      GH_YML_JOBNAME: ${{ matrix.jobname }}
-      GH_YML_OS: Linux
+    container:
+      image: ${{ matrix.container }}
+      options: --shm-size=1g
+      env:
+        GH_YML_JOBNAME: ${{ matrix.jobname }}
+        GH_YML_OS: Linux
 
     strategy:
       fail-fast: false
@@ -61,10 +63,10 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.container }}
-      options: --privileged
-    env:
-      GH_YML_JOBNAME: ${{ matrix.jobname }}
-      GH_YML_OS: Linux
+      options: --privileged --shm-size=1g
+      env:
+        GH_YML_JOBNAME: ${{ matrix.jobname }}
+        GH_YML_OS: Linux
 
     strategy:
       fail-fast: false
@@ -103,10 +105,12 @@ jobs:
 
   linux_spack:
     runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    env:
-      GH_YML_JOBNAME: ${{ matrix.jobname }}
-      GH_YML_OS: Linux
+    container:
+      image: ${{ matrix.container }}
+      options: --shm-size=1g
+      env:
+        GH_YML_JOBNAME: ${{ matrix.jobname }}
+        GH_YML_OS: Linux
 
     strategy:
       fail-fast: false
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fc2bca5fc0..45a689f6ad 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,8 +13,10 @@ resources:
   containers:
   - container: el7-intel-ohpc
     image: ornladios/adios2:ci-el7-intel-ohpc
+    options: --shm-size=1g
   - container: el7-intel-openmpi-ohpc
     image: ornladios/adios2:ci-el7-intel-openmpi-ohpc
+    options: --shm-size=1g
 
 jobs:
 - job: windows
diff --git a/bindings/Fortran/CMakeLists.txt b/bindings/Fortran/CMakeLists.txt
index c3863f34b0..a9fd9b825f 100644
--- a/bindings/Fortran/CMakeLists.txt
+++ b/bindings/Fortran/CMakeLists.txt
@@ -143,6 +143,9 @@ install(
   COMPONENT adios2_fortran-development
   FILES_MATCHING
     PATTERN "adios2*.mod"
+    PATTERN "adios2*.smod"
+    PATTERN "ADIOS2*.mod"
+    PATTERN "ADIOS2*.smod"
     PATTERN "CMakeFiles" EXCLUDE
 )