diff --git a/.github/workflows/clone_a_jedi_bundle.yml b/.github/workflows/clone_a_jedi_bundle.yml
index 2d09611..411565e 100644
--- a/.github/workflows/clone_a_jedi_bundle.yml
+++ b/.github/workflows/clone_a_jedi_bundle.yml
@@ -4,36 +4,35 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
-
 jobs:
   buildbundle:
+    if: github.event.pull_request.head.repo.full_name == github.repository
     name: Clone oops bundle
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11"]
     steps:
-
-    # Setup Python
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-
-    # Clone the code repo
-    - name: Clone code repo
-      uses: actions/checkout@v4
-      with:
-        lfs: true
-
-    # Install package
-    - name: Install JEDI bundle and dependencies
-      run: python -m pip install --use-deprecated=legacy-resolver -r requirements.txt --user .
-    - name: Put executables in the path
-      run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-    # Run an application test
-    - name: Run JEDI Bundle application test
-      run: jedi_bundle Clone src/jedi_bundle/config/build.yaml
-
-    # Confirm existence of expected file
-    - name: Check
-      run: ls -l jedi_bundle/oops/CMakeLists.txt
+      # Setup Python
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      # Clone the code repo
+      - name: Clone code repo
+        uses: actions/checkout@v5
+        with:
+          lfs: true
+
+      # Install package
+      - name: Install JEDI bundle and dependencies
+        run: python -m pip install --use-deprecated=legacy-resolver -r requirements.txt .
+
+      # Run an application test
+      - name: Run JEDI Bundle application test
+        run: jedi_bundle Clone src/jedi_bundle/config/build.yaml
+
+      # Confirm existence of expected file
+      - name: Check
+        run: ls -l jedi_bundle/oops/CMakeLists.txt
diff --git a/.github/workflows/python_coding_norms.yml b/.github/workflows/python_coding_norms.yml
index f3e0492..363bc29 100644
--- a/.github/workflows/python_coding_norms.yml
+++ b/.github/workflows/python_coding_norms.yml
@@ -8,26 +8,29 @@ jobs:
   pycodestyle:
     name: Check Python Coding Norms
     runs-on: ubuntu-latest
-    steps:
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11"]
 
-    # Setup Python
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.9
+    steps:
+      # Setup Python
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
 
-    # Update conda
-    - name: Update conda
-      run: conda update -n base -c defaults conda
+      # Update conda
+      - name: Update conda
+        run: conda update -n base -c defaults conda
 
-    # Install pycodestyle
-    - name: Install pycodestyle
-      run: conda install -c conda-forge pycodestyle
+      # Install pycodestyle
+      - name: Install pycodestyle
+        run: conda install -c conda-forge pycodestyle
 
-    # Clone the code repo
-    - name: Clone code repo
-      uses: actions/checkout@v2
+      # Clone the code repo
+      - name: Clone code repo
+        uses: actions/checkout@v2
 
-    # Run python codestyle
-    - name: Run python codestyle
-      run: $CONDA/bin/python3 pycodestyle_run.py
+      # Run python codestyle
+      - name: Run python codestyle
+        run: $CONDA/bin/python3 pycodestyle_run.py
diff --git a/src/jedi_bundle/__init__.py b/src/jedi_bundle/__init__.py
index f749895..99e30c0 100644
--- a/src/jedi_bundle/__init__.py
+++ b/src/jedi_bundle/__init__.py
@@ -9,4 +9,4 @@
 build_directory = os.path.dirname(__file__)
 
 # Set the version for jedi_bundle
-__version__ = '1.0.30'
+__version__ = '1.0.40'
diff --git a/src/jedi_bundle/config/build.yaml b/src/jedi_bundle/config/build.yaml
index d278372..a0d0c47 100644
--- a/src/jedi_bundle/config/build.yaml
+++ b/src/jedi_bundle/config/build.yaml
@@ -2,10 +2,9 @@ clone_options:
   path_to_source: jedi_bundle
   user_branch: ''
   github_orgs:
-    - JCSDA-internal
     - JCSDA
+    - JCSDA-internal
     - GEOS-ESM
-    - NOAA-EMC
   bundles:
     - oops
   extra_repos: [gsibec]
@@ -21,4 +20,4 @@ configure_options:
   external_modules: false
 
 make_options:
-  cores_to_use_for_make: 6
+  cores_to_use_for_make: 24
diff --git a/src/jedi_bundle/config/bundles/da-utils.yaml b/src/jedi_bundle/config/bundles/da-utils.yaml
deleted file mode 100644
index c933c9b..0000000
--- a/src/jedi_bundle/config/bundles/da-utils.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-required_repos:
-  - jedicmake
-  - oops
-  - ioda
-  - da-utils
diff --git a/src/jedi_bundle/config/pinned_versions.yaml b/src/jedi_bundle/config/pinned_versions.yaml
index 096b241..f3c4d83 100644
--- a/src/jedi_bundle/config/pinned_versions.yaml
+++ b/src/jedi_bundle/config/pinned_versions.yaml
@@ -41,6 +41,3 @@
 - ufo-data:
     branch: f341ea01b05ada9514b3bf7ec8045f9066ce2ed5
     commit: true
-- da-utils:
-    branch: 6292c36b47d1f328cfe4eaf04fb54a400b12e8e9
-    commit: true
diff --git a/src/jedi_bundle/config/platforms/nas_aitken.yaml b/src/jedi_bundle/config/platforms/nas_aitken.yaml
new file mode 100644
index 0000000..f960402
--- /dev/null
+++ b/src/jedi_bundle/config/platforms/nas_aitken.yaml
@@ -0,0 +1,74 @@
+platform_name: nas_aitken
+is_it_me:
+  - command: 'hostname'
+    contains: afe
+crtm_coeffs_path: '/nobackup/dardag/SwellStaticFiles/jedi/crtm_coefficients/'
+crtm_coeffs_version: '2.4.1_skylab_4.0'
+modules:
+  default_modules: intel-oneapi
+  intel-oneapi:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-oneapi-2024.2.0/install/modulefiles/Core
+      - module load stack-oneapi/2024.2.0
+      - module load stack-mpt/2.30
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module unload -f gsibec crtm
+      - module load gmao-swell-env/1.0.0
+      - module load sp/2.5.0
+    configure: -DMPIEXEC_EXECUTABLE="/nasa/hpe/mpt/2.30_rhel810/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
+  intel-oneapi-geos:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-oneapi-2024.2.0/install/modulefiles/Core
+      - module load stack-oneapi/2024.2.0
+      - module load stack-mpt/2.30
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload -f gsibec crtm
+      - module load sp/2.5.0
+      - module load cmake esmf/8.8.0 gftl gftl-shared pflogger fargparse udunits
+    configure: -DMPIEXEC_EXECUTABLE="/nasa/hpe/mpt/2.30_rhel810/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
+  gnu:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-gcc-12.3.0/install/modulefiles/Core
+      - module load stack-gcc/12.3.0
+      - module load stack-openmpi/4.1.8
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload -f gsibec crtm
+      - module load sp/2.5.0
+    configure: -DMPIEXEC_EXECUTABLE="/usr/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n"
+  gnu-geos:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-gcc-12.3.0/install/modulefiles/Core
+      - module load stack-gcc/12.3.0
+      - module load stack-openmpi/4.1.8
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload -f gsibec crtm
+      - module load sp/2.5.0
+      - module load esmf python py-pyyaml py-numpy pflogger fargparse zlib-ng cmake
+    configure: -DMPIEXEC_EXECUTABLE="/usr/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n"
diff --git a/src/jedi_bundle/config/platforms/nas_pleiades.yaml b/src/jedi_bundle/config/platforms/nas_pleiades.yaml
new file mode 100644
index 0000000..1fcafca
--- /dev/null
+++ b/src/jedi_bundle/config/platforms/nas_pleiades.yaml
@@ -0,0 +1,74 @@
+platform_name: nas_pleiades
+is_it_me:
+  - command: 'hostname'
+    contains: pfe
+crtm_coeffs_path: '/nobackup/dardag/SwellStaticFiles/jedi/crtm_coefficients/'
+crtm_coeffs_version: '2.4.1_skylab_4.0'
+modules:
+  default_modules: intel-oneapi
+  intel-oneapi:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-oneapi-2024.2.0/install/modulefiles/Core
+      - module load stack-oneapi/2024.2.0
+      - module load stack-mpt/2.30
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module unload -f gsibec crtm
+      - module load gmao-swell-env/1.0.0
+      - module load sp/2.5.0
+    configure: -DMPIEXEC_EXECUTABLE="/nasa/hpe/mpt/2.30_rhel810/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
+  intel-oneapi-geos:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-oneapi-2024.2.0/install/modulefiles/Core
+      - module load stack-oneapi/2024.2.0
+      - module load stack-mpt/2.30
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload -f gsibec crtm
+      - module load sp/2.5.0
+      - module load cmake esmf/8.8.0 gftl gftl-shared pflogger fargparse udunits
+    configure: -DMPIEXEC_EXECUTABLE="/nasa/hpe/mpt/2.30_rhel810/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
+  gnu:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-gcc-12.3.0/install/modulefiles/Core
+      - module load stack-gcc/12.3.0
+      - module load stack-openmpi/4.1.8
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload -f gsibec crtm
+      - module load sp/2.5.0
+    configure: -DMPIEXEC_EXECUTABLE="/usr/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n"
+  gnu-geos:
+    init:
+      - source /usr/share/modules/init/bash
+    load:
+      - module purge
+      - module use /nobackup/gmao_SIteam/modulefiles
+      - module use /nobackup/gmao_SIteam/spack-stack/spack-stack-1.9.3/envs/ue-gcc-12.3.0/install/modulefiles/Core
+      - module load stack-gcc/12.3.0
+      - module load stack-openmpi/4.1.8
+      - module load stack-python/3.11.7
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload -f gsibec crtm
+      - module load sp/2.5.0
+      - module load esmf python py-pyyaml py-numpy pflogger fargparse zlib-ng cmake
+    configure: -DMPIEXEC_EXECUTABLE="/usr/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n"