diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 12073596..e9a7c28a 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -12,6 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Workaround github issue https://github.com/actions/runner-images/issues/7192
+        if: startsWith(matrix.os, 'ubuntu-')
+        run: sudo echo RESET grub-efi/install_devices | sudo debconf-communicate grub-pc
+
       - name: Install required system packages for macOS
         if: startsWith(matrix.os, 'macos-')
         run: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f11a24d7..cad903b9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,6 +28,7 @@ COPY . .
 USER root
 RUN chown -R user:user /opt/aleph-client
 
+RUN git config --global --add safe.directory /opt/aleph-client
 RUN pip install -e .[testing,ethereum,solana,tezos]
 
 RUN mkdir /data