diff --git a/core/src/main/java/io/undertow/Undertow.java b/core/src/main/java/io/undertow/Undertow.java
index 978c6ac8e9..ecfd1dfe5d 100644
--- a/core/src/main/java/io/undertow/Undertow.java
+++ b/core/src/main/java/io/undertow/Undertow.java
@@ -117,7 +117,7 @@ public static Builder builder() {
     }
 
     public synchronized void start() {
-        UndertowLogger.ROOT_LOGGER.infof("starting server: %s", Version.getFullVersionString());
+        UndertowLogger.ROOT_LOGGER.startingServer(Version.getFullVersionString());
         xnio = Xnio.getInstance(Undertow.class.getClassLoader());
         channels = new ArrayList<>();
         try {
@@ -256,7 +256,7 @@ public synchronized void start() {
     }
 
     public synchronized void stop() {
-        UndertowLogger.ROOT_LOGGER.infof("stopping server: %s", Version.getFullVersionString());
+        UndertowLogger.ROOT_LOGGER.stoppingServer(Version.getFullVersionString());
         if (channels != null) {
             for (AcceptingChannel<? extends StreamConnection> channel : channels) {
                 IoUtils.safeClose(channel);
diff --git a/core/src/main/java/io/undertow/UndertowLogger.java b/core/src/main/java/io/undertow/UndertowLogger.java
index 3bdfcc23ad..02a5bab09d 100644
--- a/core/src/main/java/io/undertow/UndertowLogger.java
+++ b/core/src/main/java/io/undertow/UndertowLogger.java
@@ -488,4 +488,24 @@ void nodeConfigCreated(URI connectionURI, String balancer, String domain, String
     @LogMessage(level = WARN)
     @Message(id = 5107, value = "Failed to set web socket timeout.")
     void failedToSetWSTimeout(@Cause Exception e);
+
+    @LogMessage(level = ERROR)
+    @Message(id = 5108, value = "Suspended request was skipped.")
+    void suspendedRequestSkip(@Cause Throwable e);
+
+    @LogMessage(level = ERROR)
+    @Message(id = 5109, value = "Ignoring specified SameSite mode [%s] for cookie [%s].")
+    void ignoreSameSiteCookieMode(@Cause Throwable e, String mode, String name);
+
+    @LogMessage(level = INFO)
+    @Message(id = 5110, value = "Starting server: %s.")
+    void startingServer(String version);
+
+    @LogMessage(level = INFO)
+    @Message(id = 5111, value = "Stopping server: %s.")
+    void stoppingServer(String version);
+
+    @LogMessage(level = ERROR)
+    @Message(id = 5112, value = "Missing JSM permissions for path %s")
+    void missingJSMPermissions(@Cause SecurityException e, String path);
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/undertow/server/handlers/CookieImpl.java b/core/src/main/java/io/undertow/server/handlers/CookieImpl.java
index 1e6ba2cc70..fa4559a45e 100644
--- a/core/src/main/java/io/undertow/server/handlers/CookieImpl.java
+++ b/core/src/main/java/io/undertow/server/handlers/CookieImpl.java
@@ -176,7 +176,7 @@ public Cookie setSameSiteMode(final String mode) {
             this.sameSiteMode = m;
             this.setSameSite(true);
         } else {
-            UndertowLogger.REQUEST_LOGGER.warnf(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), "Ignoring specified SameSite mode [%s] for cookie [%s]", mode, this.name);
+            UndertowLogger.REQUEST_LOGGER.ignoreSameSiteCookieMode(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), mode, this.name);
         }
         return this;
     }
diff --git a/core/src/main/java/io/undertow/server/handlers/RequestLimit.java b/core/src/main/java/io/undertow/server/handlers/RequestLimit.java
index 36504343cc..a0739e4c09 100644
--- a/core/src/main/java/io/undertow/server/handlers/RequestLimit.java
+++ b/core/src/main/java/io/undertow/server/handlers/RequestLimit.java
@@ -72,7 +72,7 @@ public void exchangeEvent(final HttpServerExchange exchange, final NextListener
                     found = true;
                     break;
                 } catch (Throwable e) {
-                    UndertowLogger.ROOT_LOGGER.error("Suspended request was skipped", e);
+                    UndertowLogger.ROOT_LOGGER.suspendedRequestSkip(e);
                 }
             }
 
diff --git a/core/src/main/java/io/undertow/server/handlers/resource/PathResourceManager.java b/core/src/main/java/io/undertow/server/handlers/resource/PathResourceManager.java
index 0a79abcc30..1799ab9778 100644
--- a/core/src/main/java/io/undertow/server/handlers/resource/PathResourceManager.java
+++ b/core/src/main/java/io/undertow/server/handlers/resource/PathResourceManager.java
@@ -247,7 +247,7 @@ public Resource getResource(final String p) {
             UndertowLogger.REQUEST_LOGGER.debugf(e, "Invalid path %s", p);
             return null;
         } catch (SecurityException e) {
-            UndertowLogger.REQUEST_LOGGER.errorf(e, "Missing JSM permissions for path %s", p);
+            UndertowLogger.REQUEST_LOGGER.missingJSMPermissions(e, p);
             throw e;
         } catch (Exception e) {
             UndertowLogger.REQUEST_LOGGER.debugf(e, "Other issue for path %s", p);
diff --git a/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java b/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java
index e78edc5426..a18d5d958b 100644
--- a/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java
+++ b/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java
@@ -140,4 +140,8 @@ public interface UndertowServletLogger extends BasicLogger {
     @Message(id = 15024, value = "Servlet %s init() method in web application %s threw exception")
     void failedToLoad(String servletName, String appName, @Cause Throwable t);
 
+    @LogMessage(level = ERROR)
+    @Message(id = 15025, value = "Ignoring specified SameSite mode [%s] for cookie [%s].")
+    void ignoreSameSiteCookieMode(@Cause Throwable e, String mode, String name);
+
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/ServletCookieAdaptor.java b/servlet/src/main/java/io/undertow/servlet/spec/ServletCookieAdaptor.java
index 591b5656ef..b1a4b1a4d2 100644
--- a/servlet/src/main/java/io/undertow/servlet/spec/ServletCookieAdaptor.java
+++ b/servlet/src/main/java/io/undertow/servlet/spec/ServletCookieAdaptor.java
@@ -179,7 +179,7 @@ public Cookie setSameSiteMode(final String mode) {
             UndertowServletLogger.REQUEST_LOGGER.tracef("Setting SameSite mode to [%s] for cookie [%s]", m, this.getName());
            cookie.setAttribute(SAME_SITE, m);
         } else {
-            UndertowServletLogger.REQUEST_LOGGER.warnf(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), "Ignoring specified SameSite mode [%s] for cookie [%s]", mode, this.getName());
+            UndertowServletLogger.REQUEST_LOGGER.ignoreSameSiteCookieMode(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), mode, this.getName());
         }
         return this;
     }