diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 393549ea6c2..5314ec33dbd 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build_test_mapl:
-    name: Build and Test MAPL
+    name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
       image: gmao/ubuntu20-geos-env-mkl:v7.5.0-openmpi_4.1.2-gcc_11.2.0
@@ -34,9 +34,12 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
+      - name: Set all directories as git safe
+        run: |
+          git config --global --add safe.directory '*'
       - name: Versions etc.
         run: |
           gfortran --version
@@ -87,9 +90,12 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
+      - name: Set all directories as git safe
+        run: |
+          git config --global --add safe.directory '*'
       - name: Versions etc.
         run: |
           ifort --version
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b5b7b1d059..a7baa4b7706 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Moved to `checkout@v3` action due to git safe directory issue
+
 ### Removed
 
 ### Deprecated