diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index 732c90f..ca3b431 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'application'
+    alias(catalog.plugins.envelope)
 }
 
 repositories {
@@ -10,7 +10,7 @@ dependencies {
     implementation project(':')
 }
 
-application {
+envelopeJar {
     mainClass = 'net.woggioni.jwo.benchmark.Main'
 }
 
diff --git a/build.gradle b/build.gradle
index 68763f7..b789340 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id 'maven-publish'
-    id 'net.woggioni.gradle.multi-release-jar'
-    id 'net.woggioni.gradle.lombok' apply false
+    alias(catalog.plugins.multi.release.jar)
+    alias(catalog.plugins.lombok) apply false
 }
 
 allprojects {
     apply plugin: 'java-library'
-    apply plugin: 'net.woggioni.gradle.lombok'
+    apply plugin: catalog.plugins.lombok.get().pluginId
 
     group = "net.woggioni"
     version = getProperty('jwo.version')
@@ -17,15 +17,15 @@ allprojects {
         }
         mavenCentral()
     }
+    
     dependencies {
-        testImplementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version'))
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params'
-        testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
+        testImplementation catalog.junit.jupiter.api
+        testImplementation catalog.junit.jupiter.params
+        testRuntimeOnly catalog.junit.jupiter.engine
     }
 
     lombok {
-        version = getProperty('lombok.version')
+        version = catalog.versions.lombok.get()
     }
 }
 
@@ -39,7 +39,7 @@ configurations {
 }
 
 dependencies {
-    implementation group: "org.slf4j", name: "slf4j-api", version: getProperty('slf4j.version')
+    implementation catalog.slf4j.api
     pathClassloaderTest group: 'com.google.inject', name: 'guice', version: getProperty('guice.version')
 }
 
diff --git a/gradle.properties b/gradle.properties
index 17c01c1..e4e37e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,4 @@
-gradle.version = 7.4.2
+gradle.version = 7.5.1
 jwo.version=1.0-SNAPSHOT
 lys.version = 0.1-SNAPSHOT
-lombok.version=1.18.22
 guice.version = 5.0.1
-slf4j.version=1.7.36
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..ae04661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 607c2ca..abdb3b9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,9 +6,25 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    plugins {
-        id "net.woggioni.gradle.lombok" version "0.1"
-        id "net.woggioni.gradle.multi-release-jar" version "0.1"
+//    plugins {
+//        id "net.woggioni.gradle.lombok" version "0.1"
+//        id "net.woggioni.gradle.multi-release-jar" version "0.1"
+//    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        maven {
+            url = 'https://woggioni.net/mvn/'
+            content {
+                includeGroup 'com.lys'
+            }
+        }
+    }
+    versionCatalogs {
+        catalog {
+            from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version')
+        }
     }
 }