diff --git a/build.gradle.kts b/build.gradle.kts
index 028eaa2f8..5fa7f664e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import java.time.Instant
 
 plugins {
     java
@@ -27,46 +26,44 @@ group = "com.hivemq"
 description = "HiveMQ CE is a Java-based open source MQTT broker that fully supports MQTT 3.x and MQTT 5"
 
 metadata {
-    readableName.set("HiveMQ Community Edition")
+    readableName = "HiveMQ Community Edition"
     organization {
-        name.set("HiveMQ GmbH")
-        url.set("https://www.hivemq.com/")
+        name = "HiveMQ GmbH"
+        url = "https://www.hivemq.com/"
     }
     license {
         apache2()
     }
     developers {
         register("cschaebe") {
-            fullName.set("Christoph Schaebel")
-            email.set("christoph.schaebel@hivemq.com")
+            fullName = "Christoph Schaebel"
+            email = "christoph.schaebel@hivemq.com"
         }
         register("lbrandl") {
-            fullName.set("Lukas Brandl")
-            email.set("lukas.brandl@hivemq.com")
+            fullName = "Lukas Brandl"
+            email = "lukas.brandl@hivemq.com"
         }
         register("flimpoeck") {
-            fullName.set("Florian Limpoeck")
-            email.set("florian.limpoeck@hivemq.com")
+            fullName = "Florian Limpoeck"
+            email = "florian.limpoeck@hivemq.com"
         }
         register("sauroter") {
-            fullName.set("Georg Held")
-            email.set("georg.held@hivemq.com")
+            fullName = "Georg Held"
+            email = "georg.held@hivemq.com"
         }
         register("SgtSilvio") {
-            fullName.set("Silvio Giebl")
-            email.set("silvio.giebl@hivemq.com")
+            fullName = "Silvio Giebl"
+            email = "silvio.giebl@hivemq.com"
         }
     }
     github {
-        org.set("hivemq")
-        repo.set("hivemq-community-edition")
         issues()
     }
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion = JavaLanguageVersion.of(11)
     }
     withJavadocJar()
     withSourcesJar()
@@ -213,7 +210,7 @@ val hivemqZip by tasks.registering(Zip::class) {
 
     val name = "hivemq-ce-${project.version}"
 
-    archiveFileName.set("$name.zip")
+    archiveFileName = "$name.zip"
 
     from("src/distribution") { exclude("**/.gitkeep") }
     from("src/main/resources/config.xml") { into("conf") }
@@ -229,13 +226,12 @@ oci {
         }
     }
     imageDefinitions.register("main") {
-        imageName.set("hivemq/hivemq-ce")
+        imageName = "hivemq/hivemq-ce"
         allPlatforms {
             parentImages {
-                add("library:eclipse-temurin:sha256!a56ee1f79cf57b2b31152cd471a4c85b6deb3057e4a1fbe8e50b57e7d2a1d7c9") // 21.0.2_13-jre-jammy
+                add("library:eclipse-temurin:sha256!78a82edcacc6cef9fd8c8a276fbd5e08f72fcdfbaf9d28df8b2d9207a7450cb6") // 21.0.3_9-jre-jammy
             }
             config {
-                creationTime.set(Instant.EPOCH)
                 user = "10000"
                 ports = setOf("1883", "8000")
                 environment = mapOf(
@@ -251,15 +247,14 @@ oci {
             }
             layers {
                 layer("hivemq") {
-                    metadata { creationTime.set(Instant.EPOCH) }
                     contents {
                         into("opt") {
-                            filePermissions = 0b110_100_000
-                            directoryPermissions = 0b111_101_000
+                            from("docker/docker-entrypoint.sh") { filePermissions = 0b111_101_101 }
                             permissions("hivemq/", 0b111_111_000)
-                            permissions("**/*.sh", 0b111_101_000)
-                            from("docker/docker-entrypoint.sh")
                             into("hivemq") {
+                                filePermissions = 0b110_100_000
+                                directoryPermissions = 0b111_101_000
+                                permissions("**/*.sh", 0b111_101_000)
                                 permissions("conf/", 0b111_111_000)
                                 permissions("conf/config.xml", 0b110_110_000)
                                 permissions("conf/logback.xml", 0b110_110_000)
@@ -338,9 +333,9 @@ downloadLicenses {
 
 tasks.updateThirdPartyLicenses {
     dependsOn(tasks.downloadLicenses)
-    projectName.set("HiveMQ")
-    dependencyLicense.set(tasks.downloadLicenses.get().xmlDestination.resolve("dependency-license.xml"))
-    outputDirectory.set(layout.projectDirectory.dir("src/distribution/third-party-licenses"))
+    projectName = "HiveMQ"
+    dependencyLicense = tasks.downloadLicenses.get().xmlDestination.resolve("dependency-license.xml")
+    outputDirectory = layout.projectDirectory.dir("src/distribution/third-party-licenses")
 }
 
 /* ******************** publishing ******************** */
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 814fcb822..a56159296 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -84,8 +84,8 @@ forbiddenApis = { id = "de.thetaphi.forbiddenapis", version = "3.7" }
 githubRelease = { id = "com.github.breadmoirai.github-release", version = "2.4.1" }
 javadocLinks = { id = "io.github.sgtsilvio.gradle.javadoc-links", version = "0.8.0" }
 license = { id = "com.github.hierynomus.license", version = "0.16.1" }
-metadata = { id = "io.github.sgtsilvio.gradle.metadata", version = "0.5.0" }
+metadata = { id = "io.github.sgtsilvio.gradle.metadata", version = "0.6.0" }
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
-oci = { id = "io.github.sgtsilvio.gradle.oci", version = "0.9.0" }
+oci = { id = "io.github.sgtsilvio.gradle.oci", version = "0.10.0" }
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
diff --git a/renovate.json5 b/renovate.json5
index 4c93eea62..5cfda987b 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -1,12 +1,12 @@
 {
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-        "local>hivemq/renovate-config:default.json5"
+    $schema: "https://docs.renovatebot.com/renovate-schema.json",
+    extends: [
+        "local>hivemq/renovate-config:default.json5",
     ],
     baseBranches: [
         "master",
-        "renovate-playground"
+        "renovate-playground",
     ],
-    "useBaseBranchConfig": "merge",
-    "branchPrefix": "renovate/hivemq-community-edition/"
+    useBaseBranchConfig: "merge",
+    branchPrefix: "renovate/hivemq-community-edition/",
 }