diff --git a/.github/workflows/CI-mpitrampoline.yml b/.github/workflows/CI-mpitrampoline.yml
index 2b03368e..0949c303 100644
--- a/.github/workflows/CI-mpitrampoline.yml
+++ b/.github/workflows/CI-mpitrampoline.yml
@@ -10,12 +10,6 @@ env:
   BUILD_TYPE: Debug
 
 jobs:
-  shellcheck:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: shellcheck
-      run: shellcheck --exclude SC2086 bin/*
   build:
     strategy:
       matrix:
@@ -28,16 +22,17 @@ jobs:
 
     - name: Configure
       run: |
+        cd mpitrampoline
         cmake \
             -B ${{github.workspace}}/build \
             -DCMAKE_INSTALL_PREFIX=$HOME/mpitrampoline
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --verbose
+      run: cd mpitrampoline && cmake --build ${{github.workspace}}/build --verbose
 
     # - name: Test
     #   working-directory: ${{github.workspace}}/build
     #   run: ctest -C ${{env.BUILD_TYPE}}
 
     - name: Install
-      run: cmake --install ${{github.workspace}}/build
+      run: cd mpitrampoline && cmake --install ${{github.workspace}}/build
diff --git a/.github/workflows/CI-mpiwrapper.yml b/.github/workflows/CI-mpiwrapper.yml
index 59805040..2201799f 100644
--- a/.github/workflows/CI-mpiwrapper.yml
+++ b/.github/workflows/CI-mpiwrapper.yml
@@ -10,12 +10,6 @@ env:
   BUILD_TYPE: Debug
 
 jobs:
-  shellcheck:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: shellcheck
-      run: shellcheck --exclude SC2086 bin/*
   build:
     strategy:
       matrix:
@@ -38,17 +32,18 @@ jobs:
 
     - name: Configure
       run: |
+        cd mpiwrapper
         cmake \
             -B ${{github.workspace}}/build \
             -DCMAKE_C_COMPILER=mpicc \
             -DCMAKE_INSTALL_PREFIX=$HOME/mpiwrapper-${{matrix.mpi}}
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --verbose
+      run: cd mpiwrapper && cmake --build ${{github.workspace}}/build --verbose
 
     # - name: Test
     #   working-directory: ${{github.workspace}}/build
     #   run: ctest -C ${{env.BUILD_TYPE}}
 
     - name: Install
-      run: cmake --install ${{github.workspace}}/build
+      run: cd mpiwrapper && cmake --install ${{github.workspace}}/build