diff --git a/.github/workflows/delivery-docker.yml b/.github/workflows/delivery-docker.yml
index c59bdd539..006b99d5b 100644
--- a/.github/workflows/delivery-docker.yml
+++ b/.github/workflows/delivery-docker.yml
@@ -50,8 +50,8 @@ jobs:
       - name: Setup Working Dir
         shell: bash
         run: |
+          rm project.toml || true
           cp head/.github/workflows/delivery/docker/project.toml project.toml
-          rm buildpack.yml
       - name: Determine App Name
         run: 'echo "IMG_NAME=${{ env.USERNAME }}/${{ env.IMG_NAME }}" >> $GITHUB_ENV'
       - name: Login to Dockerhub
diff --git a/.github/workflows/delivery/archlinux/publish-package.sh b/.github/workflows/delivery/archlinux/publish-package.sh
index f096d7c65..40c28472d 100755
--- a/.github/workflows/delivery/archlinux/publish-package.sh
+++ b/.github/workflows/delivery/archlinux/publish-package.sh
@@ -40,6 +40,9 @@ echo '> Cloning aur...'
 git clone "ssh://aur@aur.archlinux.org/${PACKAGE_NAME}.git" "${PACKAGE_AUR_DIR}"
 chown -R archie "${PACKAGE_AUR_DIR}"
 pushd "${PACKAGE_AUR_DIR}" > /dev/null
+  echo '> Declare directory ${PACKAGE_AUR_DIR} as safe'
+  git config --global --add safe.directory "${PACKAGE_AUR_DIR}"
+
   echo '> Checking out master...'
   git checkout master