diff --git a/datamodel/soap/pom.xml b/datamodel/soap/pom.xml
index e28c155d5..914c1d474 100644
--- a/datamodel/soap/pom.xml
+++ b/datamodel/soap/pom.xml
@@ -36,6 +36,11 @@
 				<artifactId>commons-fileupload</artifactId>
 				<version>1.6.0</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.ws.xmlschema</groupId>
+				<artifactId>xmlschema-core</artifactId>
+				<version>2.2.5</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
diff --git a/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpClientTransportSender.java b/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpClientTransportSender.java
index 455bfedb2..390f21454 100644
--- a/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpClientTransportSender.java
+++ b/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpClientTransportSender.java
@@ -1,12 +1,12 @@
 package com.sap.cloud.sdk.s4hana.connectivity.soap;
 
-import org.apache.axis2.transport.http.AbstractHTTPSender;
+import org.apache.axis2.transport.http.HTTPSender;
 import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
 
 class DefaultHttpClientTransportSender extends HTTPClient4TransportSender
 {
     @Override
-    protected AbstractHTTPSender createHTTPSender()
+    protected HTTPSender createHTTPSender()
     {
         return new DefaultHttpSender();
     }
diff --git a/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpSender.java b/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpSender.java
index 134643f0f..b23e664dc 100644
--- a/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpSender.java
+++ b/datamodel/soap/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/soap/DefaultHttpSender.java
@@ -1,40 +1,7 @@
 package com.sap.cloud.sdk.s4hana.connectivity.soap;
 
-import java.net.URL;
-
-import javax.annotation.Nullable;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.transport.http.HttpTransportProperties;
 import org.apache.axis2.transport.http.impl.httpclient4.HTTPSenderImpl;
-import org.apache.http.HttpHost;
 
 class DefaultHttpSender extends HTTPSenderImpl
 {
-    @SuppressWarnings( "deprecation" )
-    @Override
-    protected HttpHost getHostConfiguration(
-        final org.apache.http.impl.client.AbstractHttpClient httpClient,
-        final MessageContext messageContext,
-        final URL targetUrl )
-        throws AxisFault
-    {
-        final HttpHost hostConfiguration = super.getHostConfiguration(httpClient, messageContext, targetUrl);
-
-        @Nullable
-        final HttpTransportProperties.ProxyProperties proxyProperties =
-            (HttpTransportProperties.ProxyProperties) messageContext.getProperty(HTTPConstants.PROXY);
-
-        if( proxyProperties != null ) {
-            final String proxyHost = proxyProperties.getProxyHostName();
-            final int proxyPort = proxyProperties.getProxyPort();
-
-            final HttpHost proxy = new HttpHost(proxyHost, proxyPort);
-            httpClient.getParams().setParameter(org.apache.http.conn.params.ConnRoutePNames.DEFAULT_PROXY, proxy);
-        }
-
-        return hostConfiguration;
-    }
 }
diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml
index 4640bfd02..522f5553b 100644
--- a/dependency-bundles/bom/pom.xml
+++ b/dependency-bundles/bom/pom.xml
@@ -67,7 +67,7 @@
 		<!-- collection utilities, @Beta annotation -->
 		<commons-io.version>2.21.0</commons-io.version>
 		<!-- Apache file utils -->
-		<axis2.version>1.7.9</axis2.version>
+		<axis2.version>1.8.0</axis2.version>
 		<!--Used in essential modules: cloudplatform-connectivity, connectivity-destination-service, odata-client, odata-core, securitys-->
 		<commons-lang3.version>3.20.0</commons-lang3.version>
 		<!-- Soap requests -->