diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f2624633b4..f5f8dd2849 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,18 +33,14 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: AdoptOpenJDK/install-jdk@v1
+    - name: Set up JDKs
+      uses: actions/setup-java@v4
       with:
-        version: '8'
+        distribution: oracle
         architecture: x64
-        targets: 'JDK_8;JAVA_HOME'
-    - name: Set up JDK 21
-      uses: AdoptOpenJDK/install-jdk@v1
-      with:
-        version: '21'
-        architecture: x64
-        targets: 'JDK_21'
+        java-version: |
+          8
+          21
     - name: Set up PHP
       run: |
         apt update -y -qq
diff --git a/cicd_scripts/script.sh b/cicd_scripts/script.sh
index 8d4d85ae0d..7c5901555e 100644
--- a/cicd_scripts/script.sh
+++ b/cicd_scripts/script.sh
@@ -11,10 +11,10 @@ VERSION_PROP_FILE="version.properties"
 if [ -z ${GITHUB_ACCESS_TOKEN+x} ]; then
   # password not set,  just make private release without publishing result
   echo "No password set, making private release..."
-  JAVA_HOME=$JDK_8
+  JAVA_HOME=$JAVA_HOME_8_x64
   ant all
   # Javadoc generation is buggy with Java 8, lets generate it with Java 21
-  JAVA_HOME=$JDK_21
+  JAVA_HOME=$JAVA_HOME_21_x64
   ant javadoc
 else
   # if tag set
@@ -38,13 +38,13 @@ else
       echo "revision=$CICD_COMMIT">>$VERSION_PROP_FILE
       echo "debug=false">>$VERSION_PROP_FILE
            
-      JAVA_HOME=$JDK_8
+      JAVA_HOME=$JAVA_HOME_8_x64
 
       #compile, build, create files
       ant new-version
 
       # Javadoc generation is buggy with Java 8, lets generate it with Java 21
-      JAVA_HOME=$JDK_21
+      JAVA_HOME=$JAVA_HOME_21_x64
       ant release_lib_javadoc
             
       # release standard version based on tag
@@ -94,12 +94,12 @@ else
       echo "revision=$CICD_COMMIT">>$VERSION_PROP_FILE
       echo "debug=true">>$VERSION_PROP_FILE
       
-      JAVA_HOME=$JDK_8
+      JAVA_HOME=$JAVA_HOME_8_x64
       #compile, build, create files
       ant new-version
 
       # Javadoc generation is buggy with Java 8, lets generate it with Java 21
-      JAVA_HOME=$JDK_21
+      JAVA_HOME=$JAVA_HOME_21_x64
       ant release_lib_javadoc
                         
       CURRENT_DATE=`date +%Y-%m-%dT%H:%M:%SZ`