diff --git a/build.gradle b/build.gradle
index 6b94495..cb3f565 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
     id 'groovy'
     id 'application'
     id 'jacoco'
-    id "net.nemerosa.versioning" version "2.15.1"
-    id "com.netflix.nebula.ospackage" version "11.5.0"
+    id 'com.palantir.git-version' version "3.1.0"
+    id "com.netflix.nebula.ospackage" version "11.8.1"
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
@@ -13,15 +13,15 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
-    implementation 'info.picocli:picocli:4.7.5'
-    implementation 'org.slf4j:slf4j-api:2.0.9'
-    implementation 'org.slf4j:slf4j-simple:2.0.9'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
+    annotationProcessor 'info.picocli:picocli-codegen:4.7.6'
+    implementation 'info.picocli:picocli:4.7.6'
+    implementation 'org.slf4j:slf4j-api:2.0.13'
+    implementation 'org.slf4j:slf4j-simple:2.0.13'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4'
     implementation 'org.apache.commons:commons-collections4:4.4'
 
-    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
 }
 
 application {
@@ -38,7 +38,7 @@ test {
 }
 
 jacoco {
-    toolVersion = "0.8.10"
+    toolVersion = "0.8.12"
 }
 
 jacocoTestReport {
@@ -113,8 +113,7 @@ jar {
             'Build-OS'       : "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}",
             'Build-Jdk'      : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
             'Build-User'     : System.properties['user.name'],
-            'Build-Version'  : versioning.info.tag ?: (versioning.info.branch + "-" + versioning.info.build),
-            'Build-Revision' : versioning.info.commit,
+            'Build-Version'  : gitVersion(),
             'Build-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ss.SSSZ").toString(),
         )
     }
diff --git a/gradle.properties b/gradle.properties
index c5ca5a5..1534cce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 id            = syslogd
 name          = syslogd
 group         = biz.nellemann.syslogd
-version       = 1.3.5
+version       = 1.3.6
 description   = "Syslog Director"