diff --git a/gradle.properties b/gradle.properties
index 90f7f0f71..198cd8452 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,10 @@
 # limitations under the License.
 #
 group                       = com.redis
+sourceCompatibility         = 1.8
+targetCompatibility         = 1.8
+testSourceCompatibility     = 11
+testTargetCompatibility     = 11
 reproducibleBuild           = true
 
 bootPluginVersion           = 2.7.15
@@ -41,7 +45,7 @@ oracleVersion               = 19.3.0.0
 picocliVersion              = 4.7.5
 plexusVersion               = 4.0.0
 progressbarVersion          = 0.10.0
-springBatchRedisVersion     = 3.6.8
+springBatchRedisVersion     = 3.6.9
 sqliteVersion               = 3.43.0.0
 testcontainersRedisVersion  = 1.6.4
 testcontainersVersion       = 1.19.0
diff --git a/gradle/LICENSE_HEADER b/gradle/LICENSE_HEADER
deleted file mode 100644
index e3be72152..000000000
--- a/gradle/LICENSE_HEADER
+++ /dev/null
@@ -1,15 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-
-Copyright ${copyrightYear} The RIOT authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c4..943f0cbfa 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8..508322917 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 0adc8e1a5..65dcd68d6 100755
--- a/gradlew
+++ b/gradlew
@@ -83,8 +83,10 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,13 +133,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -145,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,10 +197,6 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/jreleaser.yml b/jreleaser.yml
index 83df68321..2d1f8f198 100644
--- a/jreleaser.yml
+++ b/jreleaser.yml
@@ -29,7 +29,7 @@ project:
       height: 256
   java:
     groupId: com.redis
-    version: '20'
+    version: '8'
     multiProject: true
     mainClass: com.redis.riot.cli.Main
   tags:
@@ -127,7 +127,7 @@ assemble:
     riot-standalone:
       active: ALWAYS
       java:
-        version: '20'
+        version: '11'
       imageName: '{{distributionName}}-{{projectEffectiveVersion}}'
       executable: riot
       fileSets: