diff --git a/.github/workflows/build_preview_app.yml b/.github/workflows/build_preview_app.yml
index 425d62d..d277ea7 100644
--- a/.github/workflows/build_preview_app.yml
+++ b/.github/workflows/build_preview_app.yml
@@ -17,8 +17,8 @@ jobs:
       - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
-          distribution: adopt
+          java-version: '21'
+          distribution: 'temurin'
           cache: gradle
 
       - name: Grant execute permission for gradlew
diff --git a/.github/workflows/create_github_release.yml b/.github/workflows/create_github_release.yml
index 29ea1a4..4915abd 100644
--- a/.github/workflows/create_github_release.yml
+++ b/.github/workflows/create_github_release.yml
@@ -1,13 +1,10 @@
 name: Create Release
 
 permissions: write-all
-  
+
 on:
-  push:
-    branches:    
-      - main
-    tags:        
-      - v*.*
+  release:
+    types: [ published , prereleased ]
   workflow_dispatch:
 
 jobs:
@@ -20,8 +17,8 @@ jobs:
       - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
-          distribution: adopt
+          java-version: '21'
+          distribution: 'temurin'
           cache: gradle
 
       - name: Create release key