diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
index 709b49e..f7f71ce 100644
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -21,11 +21,17 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
+
+      - name: Add gradle.properties
+        run: |
+          cp gradle.properties.template gradle.properties
+          # Disable jdk version setting to as it's defined above
+          sed -i "s/org.gradle.java.home=/#org.gradle.java.home=/g" gradle.properties
 
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml
index 8627cfb..9613fe5 100644
--- a/.github/workflows/gradle_publish.yml
+++ b/.github/workflows/gradle_publish.yml
@@ -18,11 +18,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Add gradle.properties
         run: |
@@ -30,6 +30,8 @@ jobs:
           cp gradle.properties.template gradle.properties
           echo "githubUser=${{ github.actor }}" >> gradle.properties
           echo "githubToken=${{ secrets.GITHUB_TOKEN }}" >> gradle.properties
+          # Disable jdk version setting to as it's defined above
+          sed -i "s/org.gradle.java.home=/#org.gradle.java.home=/g" gradle.properties
 
       # version is required to publish artifacts to Github Registry
       - name: Set version
diff --git a/README.adoc b/README.adoc
index c84860a..0c54bc3 100644
--- a/README.adoc
+++ b/README.adoc
@@ -2,7 +2,7 @@
 
 This is a https://docs.gradle.org/current/userguide/sharing_build_logic_between_subprojects.html#sec:convention_plugins[convention plugin] implemented as https://docs.gradle.org/current/userguide/custom_plugins.html#sec:precompiled_plugins[precompiled script plugin].
 
-This Gradle Plugin is currently only tested with Gradle 7.
+This Gradle Plugin is currently only tested with Gradle 7 and 8.
 
 
 [[license]]
diff --git a/build.gradle b/build.gradle
index f7251b1..49175a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with the Cyface Publish Plugin for Android. If not, see <http://www.gnu.org/licenses/>.
  */
-
 buildscript {
-    ext.gradle_version = '7.4.2'
+    ext.gradle_version = '8.0.0'
 
     repositories {
         google()
diff --git a/gradle.properties.template b/gradle.properties.template
index 55c328e..c4f67af 100644
--- a/gradle.properties.template
+++ b/gradle.properties.template
@@ -1,2 +1,5 @@
+# Needs to point to JDK 17 (embedded in android-studio now)
+org.gradle.java.home=
+
 githubUser=
 githubToken=
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cb..ccebba7 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 5083229..37aef8d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68..79a61d4 100755
--- a/gradlew
+++ b/gradlew
@@ -144,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
@@ -152,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