diff --git a/.github/versions.env b/.github/versions.env
index 1060da8..d933072 100755
--- a/.github/versions.env
+++ b/.github/versions.env
@@ -1,3 +1,3 @@
-IMAGE_VERSION=1.22.1
+IMAGE_VERSION=1.22.2
 NDK_VERSION=29.0.14206865
 BAZELISK_VERSION=v1.27.0
diff --git a/.github/workflows/post_merge_deploy.yml b/.github/workflows/post_merge_deploy.yml
index 830871c..d4bb81f 100644
--- a/.github/workflows/post_merge_deploy.yml
+++ b/.github/workflows/post_merge_deploy.yml
@@ -140,22 +140,25 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
     - green
+    permissions:
+      contents: write
     steps:
     - uses: actions/checkout@v3.5.0
     - name: Set versions
       uses: tw3lveparsecs/github-actions-set-variables@latest
       with:
         envFilePath: .github/versions.env
-    - uses: avakar/tag-and-release@v1
+    - uses: softprops/action-gh-release@v2
       with:
         tag_name: ${{ env.IMAGE_VERSION }}
-        body: >
-          **Base**: image with JDK17, Android SDK Manager ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_base/Dockerfile)):<br/>
+        generate_release_notes: true
+        body: |
+          **Base**: image with JDK 21, Android SDK Manager ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_base/Dockerfile)):<br/>
           ```
           docker pull ghcr.io/menny/android_base:${{ env.IMAGE_VERSION }}
           ```<br/>
           <br/>
-          **Android**: Base + Build Tools, Platform level 35 ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/Dockerfile)):<br/>
+          **Android**: Base + Build Tools, Platform level 36 ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/Dockerfile)):<br/>
           ```
           docker pull ghcr.io/menny/android:${{ env.IMAGE_VERSION }}
           ```<br/>
@@ -179,7 +182,5 @@ jobs:
           ```
           docker pull ghcr.io/menny/android_dev:${{ env.IMAGE_VERSION }}
           ```
-
-
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}