diff --git a/gxspringboot/pom.xml b/gxspringboot/pom.xml
index 10c756fd6..45b761371 100644
--- a/gxspringboot/pom.xml
+++ b/gxspringboot/pom.xml
@@ -14,11 +14,16 @@
 	<name>GeneXus Spring Boot</name>
 
 	<dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>gxclassR</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>gxclassR</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>gxwrapperjakarta</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
diff --git a/gxspringboot/src/main/java/com/genexus/springboot/GXServletContextInitializer.java b/gxspringboot/src/main/java/com/genexus/springboot/GXServletContextInitializer.java
index 96a6e9d4e..01704a727 100644
--- a/gxspringboot/src/main/java/com/genexus/springboot/GXServletContextInitializer.java
+++ b/gxspringboot/src/main/java/com/genexus/springboot/GXServletContextInitializer.java
@@ -28,6 +28,17 @@ public void onStartup(ServletContext container) {
 				ServletRegistration.Dynamic dispatcherQuery3 = container.addServlet("gxqueryviewerforsd", (Servlet) Class.forName("qviewer.services.gxqueryviewerforsd").getConstructor().newInstance());
 				dispatcherQuery3.addMapping("/qviewer.services.gxqueryviewerforsd");
 			}
+
+			try {
+				Class<?> wsServlet = Class.forName("com.sun.xml.ws.transport.http.servlet.WSServlet");
+				ServletRegistration.Dynamic dispatcherQuery3 = container.addServlet("JaxWSServlet", (Servlet) wsServlet.getConstructor().newInstance());
+				dispatcherQuery3.setLoadOnStartup(1);
+				dispatcherQuery3.addMapping("/servlet/ws/*");
+				dispatcherQuery3.addMapping("/ws/*");
+			}
+			catch (ClassNotFoundException e) {
+				log.info("Declare servlet mapping for com.sun.xml.ws.transport.http.servlet.WSServlet is not necessary");
+			}
 		}
 		catch(Exception e) {
 			log.error("Error executing ServletContextInitializer", e);
diff --git a/gxspringboot/src/main/java/com/genexus/springboot/jaxws/GXWSServletContextListener.java b/gxspringboot/src/main/java/com/genexus/springboot/jaxws/GXWSServletContextListener.java
new file mode 100644
index 000000000..630df5100
--- /dev/null
+++ b/gxspringboot/src/main/java/com/genexus/springboot/jaxws/GXWSServletContextListener.java
@@ -0,0 +1,42 @@
+package com.genexus.springboot.jaxws;
+
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebListener;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.springframework.core.io.ClassPathResource;
+import java.io.IOException;
+
+@WebListener
+public class GXWSServletContextListener implements ServletContextListener {
+	private static Logger log = org.apache.logging.log4j.LogManager.getLogger(GXWSServletContextListener.class);
+	private com.sun.xml.ws.transport.http.servlet.WSServletContextListener listener = null;
+
+	public static final String JAXWS_METADATA_FILE = "sun-jaxws.xml";
+	public static final String JAXWS_METADATA_PATH = "WEB-INF/sun-jaxws.xml";
+
+	public GXWSServletContextListener() {
+		if (new ClassPathResource(JAXWS_METADATA_FILE).exists())
+			this.listener = new com.sun.xml.ws.transport.http.servlet.WSServletContextListener();
+	}
+
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		if (listener != null) {
+			try {
+				FileUtils.copyInputStreamToFile(new ClassPathResource(JAXWS_METADATA_FILE).getInputStream(),
+					new java.io.File(sce.getServletContext().getRealPath("") + JAXWS_METADATA_PATH));
+			} catch (IOException e) {
+				log.error(String.format("File %s not found", JAXWS_METADATA_FILE), e);
+			}
+
+			listener.contextInitialized(sce);
+		}
+	}
+
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		if (listener != null)
+			listener.contextDestroyed(sce);
+	}
+}