diff --git a/annot/pom.xml b/annot/pom.xml
index e18eeac674..2fb892ef30 100644
--- a/annot/pom.xml
+++ b/annot/pom.xml
@@ -23,7 +23,7 @@
 		<groupId>org.membrane-soa</groupId>
 		<artifactId>service-proxy-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>5.7.5-SNAPSHOT</version>
+		<version>5.8.0</version>
 	</parent>
 
 	<dependencies>
diff --git a/annot/src/main/java/com/predic8/membrane/annot/generator/HelpReference.java b/annot/src/main/java/com/predic8/membrane/annot/generator/HelpReference.java
index 8fe29168e1..59f29141fb 100644
--- a/annot/src/main/java/com/predic8/membrane/annot/generator/HelpReference.java
+++ b/annot/src/main/java/com/predic8/membrane/annot/generator/HelpReference.java
@@ -52,7 +52,7 @@ public void writeHelp(Model m) {
 			String path = System.getenv("MEMBRANE_GENERATE_DOC_DIR");
 			if (path == null)
 				return;
-			path = path.replace("%VERSION%", "5.7");
+			path = path.replace("%VERSION%", "5.8");
 
 			System.out.println("Generating Reference in location: " + path);
 
diff --git a/core/.factorypath b/core/.factorypath
index f8fa1a6cc7..efb73f01c1 100644
--- a/core/.factorypath
+++ b/core/.factorypath
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><factorypath>
-    <factorypathentry enabled="true" id="M2_REPO/org/membrane-soa/service-proxy-annot/5.7.5-SNAPSHOT/service-proxy-annot-5.7.5-SNAPSHOT.jar" kind="VARJAR" runInBatchMode="false"/>
+    <factorypathentry enabled="true" id="M2_REPO/org/membrane-soa/service-proxy-annot/5.8.0/service-proxy-annot-5.8.0.jar" kind="VARJAR" runInBatchMode="false"/>
 </factorypath>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index c73ea98421..220555fde0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
 		<groupId>org.membrane-soa</groupId>
 		<artifactId>service-proxy-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>5.7.5-SNAPSHOT</version>
+		<version>5.8.0</version>
 	</parent>
 
 	<!-- Open Telemetry -->
diff --git a/core/src/main/java/com/predic8/membrane/core/Constants.java b/core/src/main/java/com/predic8/membrane/core/Constants.java
index 48d75d7b84..f7369339cd 100644
--- a/core/src/main/java/com/predic8/membrane/core/Constants.java
+++ b/core/src/main/java/com/predic8/membrane/core/Constants.java
@@ -32,7 +32,7 @@ public class Constants {
 	public static final String VERSION;
 
 	static {
-		String version = "5.7"; // fallback
+		String version = "5.8"; // fallback
 		try {
 			Properties p = new Properties(); // Production
 			p.load(Constants.class.getResourceAsStream("/META-INF/maven/org.membrane-soa/service-proxy-core/pom.properties"));
diff --git a/distribution/examples/basic-xml-interceptor/pom.xml b/distribution/examples/basic-xml-interceptor/pom.xml
index e3770dd1e1..a9bba88e79 100644
--- a/distribution/examples/basic-xml-interceptor/pom.xml
+++ b/distribution/examples/basic-xml-interceptor/pom.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.predic8.myInterceptor</groupId>
@@ -21,7 +18,7 @@
         <dependency>
             <groupId>org.membrane-soa</groupId>
             <artifactId>service-proxy-core</artifactId>
-            <version>5.7.5-SNAPSHOT</version>
+            <version>5.8.0</version>
         </dependency>
     </dependencies>
 
@@ -81,4 +78,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/distribution/examples/custom-interceptor/pom.xml b/distribution/examples/custom-interceptor/pom.xml
index 82ebfe8da3..e8855166a3 100644
--- a/distribution/examples/custom-interceptor/pom.xml
+++ b/distribution/examples/custom-interceptor/pom.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.predic8.myInterceptor</groupId>
@@ -28,7 +25,7 @@
     <dependency>
       <groupId>org.membrane-soa</groupId>
       <artifactId>service-proxy-core</artifactId>
-      <version>5.7.5-SNAPSHOT</version>
+      <version>5.8.0</version>
     </dependency>
 
   </dependencies>
@@ -89,4 +86,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/distribution/examples/embedding-java/pom.xml b/distribution/examples/embedding-java/pom.xml
index 1c565400a3..d4a3881ec4 100644
--- a/distribution/examples/embedding-java/pom.xml
+++ b/distribution/examples/embedding-java/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.membrane-soa</groupId>
             <artifactId>service-proxy-core</artifactId>
-            <version>5.7.5-SNAPSHOT</version>
+            <version>5.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/distribution/examples/soap/add-soap-header/pom.xml b/distribution/examples/soap/add-soap-header/pom.xml
index 841864286b..0dd915b131 100644
--- a/distribution/examples/soap/add-soap-header/pom.xml
+++ b/distribution/examples/soap/add-soap-header/pom.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.predic8.myInterceptor</groupId>
@@ -21,7 +18,7 @@
         <dependency>
             <groupId>org.membrane-soa</groupId>
             <artifactId>service-proxy-core</artifactId>
-            <version>5.7.5-SNAPSHOT</version>
+            <version>5.8.0</version>
         </dependency>
 
     </dependencies>
@@ -72,4 +69,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/distribution/examples/stax-interceptor/pom.xml b/distribution/examples/stax-interceptor/pom.xml
index cb533b773a..09e9677bdd 100644
--- a/distribution/examples/stax-interceptor/pom.xml
+++ b/distribution/examples/stax-interceptor/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.membrane-soa</groupId>
             <artifactId>service-proxy-core</artifactId>
-            <version>5.7.5-SNAPSHOT</version>
+            <version>5.8.0</version>
         </dependency>
 
     </dependencies>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b76e46e2c6..f2bb979a81 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 		<groupId>org.membrane-soa</groupId>
 		<artifactId>service-proxy-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>5.7.5-SNAPSHOT</version>
+		<version>5.8.0</version>
 	</parent>
 
 	<dependencies>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index bce5a2ded7..f5c814f700 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.membrane-soa</groupId>
         <artifactId>service-proxy-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>5.7.5-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/membrane.spec b/membrane.spec
index 2e077595e4..5abfd2516c 100644
--- a/membrane.spec
+++ b/membrane.spec
@@ -4,7 +4,7 @@
 %global logdir %{_var}/log/%{name}
 
 Name:             membrane
-Version:          5.7.5-SNAPSHOT
+Version:          5.8.0
 Release:          1%{?dist}
 URL:              https://github.com/membrane/api-gateway
 Summary:          Membrane - Open Source API Gateway written in Java for REST APIs, WebSockets, STOMP and legacy Web Services
diff --git a/pom.xml b/pom.xml
index 625caa1f82..ea82a3ce3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.membrane-soa</groupId>
 	<artifactId>service-proxy-parent</artifactId>
-	<version>5.7.5-SNAPSHOT</version>
+	<version>5.8.0</version>
 	<name>${project.artifactId}</name>
 	<description>Membrane is an open source API Gateway written in Java that features:
 	- OpenAPI support with validation
diff --git a/starter/pom.xml b/starter/pom.xml
index 2c81b0eae8..bf180da552 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>service-proxy-parent</artifactId>
         <groupId>org.membrane-soa</groupId>
-        <version>5.7.5-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/test/pom.xml b/test/pom.xml
index 8b8924a628..e6b3a05721 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -23,7 +23,7 @@
 		<groupId>org.membrane-soa</groupId>
 		<artifactId>service-proxy-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>5.7.5-SNAPSHOT</version>
+		<version>5.8.0</version>
 	</parent>
 
 	<dependencies>
diff --git a/war/.factorypath b/war/.factorypath
index f8fa1a6cc7..efb73f01c1 100644
--- a/war/.factorypath
+++ b/war/.factorypath
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><factorypath>
-    <factorypathentry enabled="true" id="M2_REPO/org/membrane-soa/service-proxy-annot/5.7.5-SNAPSHOT/service-proxy-annot-5.7.5-SNAPSHOT.jar" kind="VARJAR" runInBatchMode="false"/>
+    <factorypathentry enabled="true" id="M2_REPO/org/membrane-soa/service-proxy-annot/5.8.0/service-proxy-annot-5.8.0.jar" kind="VARJAR" runInBatchMode="false"/>
 </factorypath>
\ No newline at end of file
diff --git a/war/pom.xml b/war/pom.xml
index e308ca5c17..47be868d56 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -23,7 +23,7 @@
 		<groupId>org.membrane-soa</groupId>
 		<artifactId>service-proxy-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>5.7.5-SNAPSHOT</version>
+		<version>5.8.0</version>
 	</parent>
 
 	<dependencies>