diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fe62d525d..f6b6276ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -117,7 +117,6 @@ jobs:
       - name: Clean tests
         run: npx gulp clean_test_folder
       - name: Prepare Lombok Support
-        if: false
         run: |
           npx gulp download_lombok
       - name: Prepare Pre-Release
diff --git a/gulpfile.js b/gulpfile.js
index 2c6166654..f2bc8072c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -127,14 +127,18 @@ gulp.task('download_lombok', async function (done) {
 	}
 
 	await new Promise(function (resolve, reject) {
-		const lombokVersion = '1.18.30';
+		const lombokVersion = '1.18.31';
 		// The latest lombok version can be found on the website https://projectlombok.org/downloads
-		const lombokUrl = `https://projectlombok.org/downloads/lombok-${lombokVersion}.jar`;
+		const lombokUrl = `https://projectlombok.org/lombok-edge.jar`;
 		download(lombokUrl)
-			.pipe(gulp.dest('./lombok/'))
+			.pipe(gulp.dest("./lombok/"))
 			.on("error", reject)
-			.on('end', resolve);
+			.on("end", () => {
+				fse.renameSync("./lombok/lombok-edge.jar", `./lombok/lombok-${lombokVersion}.jar`);
+				resolve();
+			});
 	});
+	// TODO: Switch to stable version once lombok 1.18.31 is released.
 	done();
 });
 
diff --git a/lombok/lombok-1.18.31-3454.jar b/lombok/lombok-1.18.31-3454.jar
deleted file mode 100644
index 5e4bea5f7..000000000
Binary files a/lombok/lombok-1.18.31-3454.jar and /dev/null differ