diff --git a/action.yml b/action.yml
index 57cf24b..f6dc14b 100644
--- a/action.yml
+++ b/action.yml
@@ -154,9 +154,13 @@ runs:
         flatpak config --system --set languages "*"
         flatpak remote-add --system ${{ inputs.flatpak_remote_name }} ${{ inputs.flatpak_remote_url }}
         flatpak install --system -y ${{ inputs.flatpak_remote_refs }} ${DIR_REFS}
-        mv /flatpak/flatpak/repo/refs/heads/deploy/* /flatpak/flatpak/repo/refs/heads/
-        rmdir /flatpak/flatpak/repo/refs/heads/deploy
-        cp -R /flatpak/flatpak/repo /flatpak_dir/
+        ostree init --repo=/flatpak_dir/repo --mode=archive-z2
+        for i in $(ostree refs --repo=/flatpak/flatpak/repo | grep '^deploy/' | sed 's/^deploy\///g')
+        do
+        ostree --repo=/flatpak_dir/repo pull-local /flatpak/flatpak/repo $(ostree --repo=/flatpak/flatpak/repo rev-parse ${{ inputs.flatpak_remote_name }}/${i})"
+        mkdir -p $(dirname /flatpak_dir/repo/refs/heads/${i})
+        ostree --repo=/flatpak/flatpak/repo rev-parse ${{ inputs.flatpak_remote_name }}/${i} > /flatpak_dir/repo/refs/heads/${i}"
+        done
         ostree refs --repo=/flatpak_dir/repo
         EOF
         docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume ${{ github.workspace }}/${FLATPAK_DIR}:/flatpak_dir ${image} /flatpak_dir/script.sh