diff --git a/.github/workflows/ballfield.yml b/.github/workflows/ballfield.yml
index 8b3b27188..ed72cbb20 100644
--- a/.github/workflows/ballfield.yml
+++ b/.github/workflows/ballfield.yml
@@ -106,6 +106,7 @@ jobs:
           fi
           ./sign.sh
           ./signBundle.sh
+          rm -f app-release.apk
         env:
           ANDROID_KEYSTORE_PASS: "${{secrets.ANDROID_KEYSTORE_PASS}}"
           ANDROID_KEYSTORE_ALIAS: "${{secrets.ANDROID_KEYSTORE_ALIAS}}"
diff --git a/.github/workflows/openttd.yml b/.github/workflows/openttd.yml
index c2f35409d..ed27f833e 100644
--- a/.github/workflows/openttd.yml
+++ b/.github/workflows/openttd.yml
@@ -68,14 +68,14 @@ jobs:
 
       - name: Get ICU revision
         id: icu-rev
-        run: echo "::set-output name=ICU_REV::`git -C project/jni/iconv/src rev-parse HEAD`:`echo ${ARCH_LIST} | sed 's/ /:/g'`"
+        run: echo "ICU_REV=`git -C project/jni/iconv/src rev-parse HEAD`:`echo ${ARCH_LIST} | sed 's/ /:/g'`" >> $GITHUB_ENV
 
       - name: Copy ICU libraries from cache
         uses: actions/cache@v2
         id: cache-icu
         with:
           # The same SDL revision will produce the same libraries
-          key: ${{steps.icu-rev.outputs.ICU_REV}}
+          key: ${{env.ICU_REV}}
           path: |
             project/jni/iconv/include
             project/jni/iconv/lib