diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 6808694c8..a01ad2d05 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: true
 
diff --git a/scripts/ci-github.sh b/scripts/ci-github.sh
index a0a673c42..06800270e 100755
--- a/scripts/ci-github.sh
+++ b/scripts/ci-github.sh
@@ -13,10 +13,17 @@ pushd "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
     . ../dev/functions.sh
 popd
 
-# Mark location safe to assuage git if necessary (happens in some distros)
+# Mark location safe to assuage git if necessary (happens under docker as we
+# run with a different user).
 if git status 2>&1 | grep -q "dubious ownership"; then
-    echo "Marking $PWD as safe for git"
-    git config --global --add safe.directory "$PWD"
+   echo "Marking $PWD as safe for git"
+   git config --global --add safe.directory "$PWD"
+
+   # Change ownership and group to current user of everything in the testsuite,
+   # as we have there some pre-created git repositories that would fail too.
+   # These are copied to temporary locations by the test runner, so we cannot
+   # simply use the `git config` trick.
+   sudo chown -R $(id -u):$(id -g) testsuite
 fi
 
 # Patch version
diff --git a/src/alire/alire-version.ads b/src/alire/alire-version.ads
index 441a826dc..a515731a3 100644
--- a/src/alire/alire-version.ads
+++ b/src/alire/alire-version.ads
@@ -16,7 +16,7 @@ private
    --  be replaced by `alr build` with the current commit, and appended with
    --  "_or_later" after build.
 
-   Current_Str : constant String := "2.1-dev";
+   Current_Str : constant String := "2.1-dev+367057b7";
    --  2.0.0:     alr settings refactor and minor fixes
    --  2.0.0-rc1: release candidate for 2.0
    --  2.0.0-b1:  first public release on the 2.0 branch
diff --git a/testsuite/fixtures/crates/libfoo_git/HEAD b/testsuite/fixtures/crates/libfoo_git/HEAD
index cb089cd89..b870d8262 100644
--- a/testsuite/fixtures/crates/libfoo_git/HEAD
+++ b/testsuite/fixtures/crates/libfoo_git/HEAD
@@ -1 +1 @@
-ref: refs/heads/master
+ref: refs/heads/main
diff --git a/testsuite/fixtures/crates/libfoo_git/config b/testsuite/fixtures/crates/libfoo_git/config
index 07d359d07..164a3ce26 100644
--- a/testsuite/fixtures/crates/libfoo_git/config
+++ b/testsuite/fixtures/crates/libfoo_git/config
@@ -2,3 +2,6 @@
 	repositoryformatversion = 0
 	filemode = true
 	bare = true
+	sharedrepository = 2
+[receive]
+	denyNonFastforwards = true
diff --git a/testsuite/fixtures/crates/libfoo_git/objects/07/2d593793eda4efbb0af13f3fa422d72f5492d3 b/testsuite/fixtures/crates/libfoo_git/objects/07/2d593793eda4efbb0af13f3fa422d72f5492d3
deleted file mode 100644
index eae9323f7..000000000
Binary files a/testsuite/fixtures/crates/libfoo_git/objects/07/2d593793eda4efbb0af13f3fa422d72f5492d3 and /dev/null differ
diff --git a/testsuite/fixtures/crates/libfoo_git/objects/9a/6aa1471db1a0c821570db875b12f08653f623c b/testsuite/fixtures/crates/libfoo_git/objects/9a/6aa1471db1a0c821570db875b12f08653f623c
deleted file mode 100644
index 30748e72a..000000000
--- a/testsuite/fixtures/crates/libfoo_git/objects/9a/6aa1471db1a0c821570db875b12f08653f623c
+++ /dev/null
@@ -1 +0,0 @@
-x
�ͽ� @ag���&
Z.Icttp�
��DL���ŧ7���v����s� �<�FQ��̈!J�Ɉfv)�ړ�#��bv����ۖ�*<xԭS���#�{I��. &�*=#���9�Ǹ���ԓ]�g�/��?�
\ No newline at end of file
diff --git a/testsuite/fixtures/crates/libfoo_git/objects/f4/fdb928df3b0be3f896b18be4987ce7338f0a54 b/testsuite/fixtures/crates/libfoo_git/objects/f4/fdb928df3b0be3f896b18be4987ce7338f0a54
deleted file mode 100644
index 64745dc27..000000000
Binary files a/testsuite/fixtures/crates/libfoo_git/objects/f4/fdb928df3b0be3f896b18be4987ce7338f0a54 and /dev/null differ
diff --git a/testsuite/fixtures/crates/libfoo_git/packed-refs b/testsuite/fixtures/crates/libfoo_git/packed-refs
deleted file mode 100644
index b888858b2..000000000
--- a/testsuite/fixtures/crates/libfoo_git/packed-refs
+++ /dev/null
@@ -1,2 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted 
-9a6aa1471db1a0c821570db875b12f08653f623c refs/heads/master
diff --git a/testsuite/fixtures/crates/libfoo_git/refs/heads/.emptydir b/testsuite/fixtures/crates/libfoo_git/refs/heads/.emptydir
deleted file mode 100644
index e69de29bb..000000000
diff --git a/testsuite/fixtures/crates/libhello_git b/testsuite/fixtures/crates/libhello_git
deleted file mode 160000
index ce78e7706..000000000
--- a/testsuite/fixtures/crates/libhello_git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ce78e7706c9d3f97605df48d8befca5407f8d328