diff --git a/.docker/linux-20.04/Dockerfile b/.docker/ubuntu-20.04/Dockerfile
similarity index 97%
rename from .docker/linux-20.04/Dockerfile
rename to .docker/ubuntu-20.04/Dockerfile
index cbd32abc27..f51bee35ec 100644
--- a/.docker/linux-20.04/Dockerfile
+++ b/.docker/ubuntu-20.04/Dockerfile
@@ -67,5 +67,5 @@ RUN apt-get install --no-install-recommends -y liblttng-ust-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git config --system --add safe.directory "*"
+RUN git config --global safe.directory '*'
 
diff --git a/.docker/linux-20.04/arm-cross-compile-sources.list b/.docker/ubuntu-20.04/arm-cross-compile-sources.list
similarity index 100%
rename from .docker/linux-20.04/arm-cross-compile-sources.list
rename to .docker/ubuntu-20.04/arm-cross-compile-sources.list
diff --git a/.docker/linux-22.04/Dockerfile b/.docker/ubuntu-22.04/Dockerfile
similarity index 97%
rename from .docker/linux-22.04/Dockerfile
rename to .docker/ubuntu-22.04/Dockerfile
index 16371337e9..46a4f27b9d 100644
--- a/.docker/linux-22.04/Dockerfile
+++ b/.docker/ubuntu-22.04/Dockerfile
@@ -67,4 +67,4 @@ RUN apt-get --no-install-recommends install -y liblttng-ust-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git config --system --add safe.directory "*"
+RUN git config --global safe.directory '*'
diff --git a/.docker/linux-22.04/arm-cross-compile-sources.list b/.docker/ubuntu-22.04/arm-cross-compile-sources.list
similarity index 100%
rename from .docker/linux-22.04/arm-cross-compile-sources.list
rename to .docker/ubuntu-22.04/arm-cross-compile-sources.list
diff --git a/.github/workflows/docker-publish-xcomp.yml b/.github/workflows/docker-publish-xcomp.yml
index fd3e9ab975..c5e26f45e1 100644
--- a/.github/workflows/docker-publish-xcomp.yml
+++ b/.github/workflows/docker-publish-xcomp.yml
@@ -5,14 +5,14 @@ on:
     branches: [ main ]
     paths:
     - .github/workflows/docker-publish-xcomp.yml
-    - .docker/linux-20.04
-    - .docker/linux-22.04
+    - .docker/ubuntu-20.04/*
+    - .docker/ubuntu-22.04/*
   pull_request:
     branches: [ main ]
     paths:
     - .github/workflows/docker-publish-xcomp.yml
-    - .docker/linux-20.04
-    - .docker/linux-22.04
+    - .docker/ubuntu-20.04/*
+    - .docker/ubuntu-22.04/*
 
 permissions: read-all
 
@@ -67,8 +67,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
         with:
-          context: .docker/linux-${{ matrix.version }}
-          file: .docker/linux-${{ matrix.version }}/Dockerfile
+          context: .docker/ubuntu-${{ matrix.version }}
+          file: .docker/ubuntu-${{ matrix.version }}/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.version }}
           labels: ${{ steps.meta.outputs.labels }}