diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 67f57bf..c47fe47 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -74,6 +74,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # TODO(DF): Remove once fixed upstream. Checkout in a container
+      # doesn't use the container's user (appears to use 1001 rather
+      # than root 0) and safe.directory setting is not applied properly.
+      # So submodule update fails.
+      # https://github.com/actions/checkout/issues/1169
+      # The check itself was added to git in
+      # https://github.com/git/git/commit/f4aa8c8bb11dae6e769cd930565173808cbb69c8
+      - name: Work around actions/checkout ownership bug
+        run: |
+          git config --system --add safe.directory $(pwd)
+
       - name: Get OpenAssetIO-MediaCreation
         uses: actions/download-artifact@v3
         with:
@@ -107,6 +118,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # TODO(DF): Remove once fixed upstream. Checkout in a container
+      # doesn't use the container's user (appears to use 1001 rather
+      # than root 0) and safe.directory setting is not applied properly.
+      # So submodule update fails.
+      # https://github.com/actions/checkout/issues/1169
+      # The check itself was added to git in
+      # https://github.com/git/git/commit/f4aa8c8bb11dae6e769cd930565173808cbb69c8
+      - name: Work around actions/checkout ownership bug
+        run: |
+          git config --system --add safe.directory $(pwd)
+
       - name: Get OpenAssetIO
         uses: actions/download-artifact@v3
         with:
@@ -141,6 +163,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # TODO(DF): Remove once fixed upstream. Checkout in a container
+      # doesn't use the container's user (appears to use 1001 rather
+      # than root 0) and safe.directory setting is not applied properly.
+      # So submodule update fails.
+      # https://github.com/actions/checkout/issues/1169
+      # The check itself was added to git in
+      # https://github.com/git/git/commit/f4aa8c8bb11dae6e769cd930565173808cbb69c8
+      - name: Work around actions/checkout ownership bug
+        run: |
+          git config --system --add safe.directory $(pwd)
+
       - name: Install Traitgen
         run: |
           python -m pip install git+https://github.com/OpenAssetIO/OpenAssetIO-TraitGen