diff --git a/.github/workflows/update-flatpak-builder-docs.yml b/.github/workflows/update-flatpak-builder-docs.yml
index 1f32629f..311d4ca5 100644
--- a/.github/workflows/update-flatpak-builder-docs.yml
+++ b/.github/workflows/update-flatpak-builder-docs.yml
@@ -18,7 +18,9 @@ jobs:
       - name: Download docs
         run: |
           curl -L -o flatpak-builder.pkg.tar.zst https://archlinux.org/packages/extra/x86_64/flatpak-builder/download/
-          tar --zstd -xf flatpak-builder.pkg.tar.zst
+          mkdir -p flatpak-builder
+          tar --zstd -xf flatpak-builder.pkg.tar.zst -C flatpak-builder
+          rm -f flatpak-builder.pkg.tar.zst
 
       - name: Get current docs version
         run: |
@@ -27,8 +29,8 @@ jobs:
 
       - name: Move docs
         run: |
-          cp -vf usr/share/doc/flatpak-builder/flatpak-builder-docs.html docs/
-          rm -rf usr/
+          cp -vf flatpak-builder/usr/share/doc/flatpak-builder/flatpak-builder-docs.html docs/
+          rm -rf flatpak-builder/
 
       - name: Get new docs version
         run: |
diff --git a/.github/workflows/update-flatpak-docs.yml b/.github/workflows/update-flatpak-docs.yml
index 7411a061..fec63909 100644
--- a/.github/workflows/update-flatpak-docs.yml
+++ b/.github/workflows/update-flatpak-docs.yml
@@ -18,7 +18,9 @@ jobs:
       - name: Download docs
         run: |
           curl -L -o flatpak-docs.pkg.tar.zst https://archlinux.org/packages/extra/x86_64/flatpak-docs/download/
-          tar --zstd -xf flatpak-docs.pkg.tar.zst
+          mkdir -p flatpak-docs
+          tar --zstd -xf flatpak-docs.pkg.tar.zst -C flatpak-docs
+          rm -f flatpak-docs.pkg.tar.zst
 
       - name: Get current docs version
         run: |
@@ -27,8 +29,8 @@ jobs:
 
       - name: Move docs
         run: |
-          cp -vf usr/share/doc/flatpak/flatpak-docs.html docs/
-          rm -rf usr/
+          cp -vf flatpak-docs/usr/share/doc/flatpak/flatpak-docs.html docs/
+          rm -rf flatpak-docs/
 
       - name: Get new docs version
         run: |