diff --git a/src/main/java/org/frankframework/flow/adapter/AdapterService.java b/src/main/java/org/frankframework/flow/adapter/AdapterService.java
index 56c56b1e..974e2612 100644
--- a/src/main/java/org/frankframework/flow/adapter/AdapterService.java
+++ b/src/main/java/org/frankframework/flow/adapter/AdapterService.java
@@ -8,7 +8,7 @@
 import java.nio.file.StandardOpenOption;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.configuration.ConfigurationFile;
 import org.frankframework.flow.configuration.ConfigurationXmlDTO;
 import org.frankframework.flow.exception.ApiException;
@@ -25,7 +25,7 @@
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
-@Slf4j
+@Log4j2
 @Service
 public class AdapterService {
 
diff --git a/src/main/java/org/frankframework/flow/configuration/ConfigurationController.java b/src/main/java/org/frankframework/flow/configuration/ConfigurationController.java
index 23eb5738..a443b6a0 100644
--- a/src/main/java/org/frankframework/flow/configuration/ConfigurationController.java
+++ b/src/main/java/org/frankframework/flow/configuration/ConfigurationController.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.exception.ApiException;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,7 +16,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.xml.sax.SAXException;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequestMapping("/projects/{projectName}/configuration")
 public class ConfigurationController {
diff --git a/src/main/java/org/frankframework/flow/configuration/ConfigurationService.java b/src/main/java/org/frankframework/flow/configuration/ConfigurationService.java
index 750d79e5..b19638cb 100644
--- a/src/main/java/org/frankframework/flow/configuration/ConfigurationService.java
+++ b/src/main/java/org/frankframework/flow/configuration/ConfigurationService.java
@@ -8,7 +8,7 @@
 import java.nio.file.Path;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.exception.ApiException;
 import org.frankframework.flow.file.FileTreeService;
 import org.frankframework.flow.filesystem.FileSystemStorage;
@@ -26,7 +26,7 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-@Slf4j
+@Log4j2
 @Service
 public class ConfigurationService {
 
diff --git a/src/main/java/org/frankframework/flow/datamapper/DatamapperGeneratorService.java b/src/main/java/org/frankframework/flow/datamapper/DatamapperGeneratorService.java
index 53e4146f..0ebd12aa 100644
--- a/src/main/java/org/frankframework/flow/datamapper/DatamapperGeneratorService.java
+++ b/src/main/java/org/frankframework/flow/datamapper/DatamapperGeneratorService.java
@@ -6,7 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import javax.xml.transform.stream.StreamSource;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import net.sf.saxon.s9api.*;
 import org.frankframework.flow.exception.ApiException;
 import org.frankframework.flow.file.FileTreeService;
@@ -14,7 +14,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
-@Slf4j
+@Log4j2
 @Service
 public class DatamapperGeneratorService {
 
diff --git a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java
index e8d406e2..b0355718 100644
--- a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java
+++ b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java
@@ -11,7 +11,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.common.config.ClientSession;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
@@ -19,7 +19,7 @@
 
 @Service
 @Profile("cloud")
-@Slf4j
+@Log4j2
 public class CloudFileSystemStorageService implements FileSystemStorage {
 	@Value("${frankflow.workspace.root:/tmp/frankflow/workspace}")
 	private String baseWorkspacePath;
diff --git a/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java b/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java
index 9507c572..49278c65 100644
--- a/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java
+++ b/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java
@@ -8,14 +8,14 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.stream.Stream;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FileSystemUtils;
 
-@Slf4j
+@Log4j2
 @Service
 @Profile("cloud")
 public class WorkspaceCleanupService {
diff --git a/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdController.java b/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdController.java
index ba24af67..56d5161f 100644
--- a/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdController.java
+++ b/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdController.java
@@ -1,13 +1,13 @@
 package org.frankframework.flow.frankconfig;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequestMapping("/xsd/frankconfig")
 public class FrankConfigXsdController {
diff --git a/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdService.java b/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdService.java
index 84634770..07c001aa 100644
--- a/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdService.java
+++ b/src/main/java/org/frankframework/flow/frankconfig/FrankConfigXsdService.java
@@ -1,14 +1,14 @@
 package org.frankframework.flow.frankconfig;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.exception.ApiException;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+@Log4j2
 @Service
-@Slf4j
 public class FrankConfigXsdService {
 	private static final String FRANKCONFIG_XSD_URL = "https://schemas.frankframework.org/FrankConfig.xsd";
 
diff --git a/src/main/java/org/frankframework/flow/frankdoc/FrankDocController.java b/src/main/java/org/frankframework/flow/frankdoc/FrankDocController.java
index f811af96..1f9c8a60 100644
--- a/src/main/java/org/frankframework/flow/frankdoc/FrankDocController.java
+++ b/src/main/java/org/frankframework/flow/frankdoc/FrankDocController.java
@@ -1,13 +1,13 @@
 package org.frankframework.flow.frankdoc;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequestMapping("/json/frankdoc")
 public class FrankDocController {
diff --git a/src/main/java/org/frankframework/flow/frankdoc/FrankDocService.java b/src/main/java/org/frankframework/flow/frankdoc/FrankDocService.java
index 1e7e349f..8a894b95 100644
--- a/src/main/java/org/frankframework/flow/frankdoc/FrankDocService.java
+++ b/src/main/java/org/frankframework/flow/frankdoc/FrankDocService.java
@@ -1,14 +1,14 @@
 package org.frankframework.flow.frankdoc;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.exception.ApiException;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+@Log4j2
 @Service
-@Slf4j
 public class FrankDocService {
 	private static final String FRANKDOC_JSON_URL = "https://frankdoc.frankframework.org/js/frankdoc.json";
 
diff --git a/src/main/java/org/frankframework/flow/git/GitController.java b/src/main/java/org/frankframework/flow/git/GitController.java
index 452fc24b..85b1049c 100644
--- a/src/main/java/org/frankframework/flow/git/GitController.java
+++ b/src/main/java/org/frankframework/flow/git/GitController.java
@@ -1,7 +1,7 @@
 package org.frankframework.flow.git;
 
 import java.io.IOException;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.exception.ApiException;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequestMapping("/projects/{projectName}/git")
 public class GitController {
diff --git a/src/main/java/org/frankframework/flow/git/GitCredentialHelper.java b/src/main/java/org/frankframework/flow/git/GitCredentialHelper.java
index 177c6739..5e38ea13 100644
--- a/src/main/java/org/frankframework/flow/git/GitCredentialHelper.java
+++ b/src/main/java/org/frankframework/flow/git/GitCredentialHelper.java
@@ -8,12 +8,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 
-@Slf4j
+@Log4j2
 public final class GitCredentialHelper {
 
 	private static final long PROCESS_TIMEOUT_SECONDS = 10;
diff --git a/src/main/java/org/frankframework/flow/git/GitService.java b/src/main/java/org/frankframework/flow/git/GitService.java
index 1621e7ea..15451e83 100644
--- a/src/main/java/org/frankframework/flow/git/GitService.java
+++ b/src/main/java/org/frankframework/flow/git/GitService.java
@@ -13,7 +13,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.MergeResult;
 import org.eclipse.jgit.api.PullCommand;
@@ -52,7 +52,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
-@Slf4j
+@Log4j2
 @Service
 public class GitService {
 
diff --git a/src/main/java/org/frankframework/flow/project/ConfigurationProjectController.java b/src/main/java/org/frankframework/flow/project/ConfigurationProjectController.java
index 8a29db0b..4255b25e 100644
--- a/src/main/java/org/frankframework/flow/project/ConfigurationProjectController.java
+++ b/src/main/java/org/frankframework/flow/project/ConfigurationProjectController.java
@@ -5,7 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.common.AllowAllFrankUserRoles;
 import org.frankframework.flow.common.FrankFrameworkService;
 import org.frankframework.flow.common.config.ClientSession;
@@ -28,7 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequestMapping("/projects")
 public class ConfigurationProjectController {
diff --git a/src/main/java/org/frankframework/flow/project/ConfigurationProjectService.java b/src/main/java/org/frankframework/flow/project/ConfigurationProjectService.java
index d555a70a..d6a20de6 100644
--- a/src/main/java/org/frankframework/flow/project/ConfigurationProjectService.java
+++ b/src/main/java/org/frankframework/flow/project/ConfigurationProjectService.java
@@ -12,7 +12,7 @@
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.eclipse.jgit.api.CloneCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -31,7 +31,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-@Slf4j
+@Log4j2
 @Service
 public class ConfigurationProjectService {
 	private static final String CONFIGURATIONS_DIR = "src/main/configurations";
diff --git a/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java b/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java
index c858b91d..fcba66b2 100644
--- a/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java
+++ b/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java
@@ -11,11 +11,11 @@
 import java.util.List;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.frankframework.flow.filesystem.FileSystemStorage;
 import org.springframework.stereotype.Service;
 
-@Slf4j
+@Log4j2
 @Service
 public class RecentProjectsService {