diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c2c81154..18390fa3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.0] - 2022-06-30
+
+- Adding siembol-monitoring module with siembol-heartbeat service
+- Simplifying parsing app parallelism settings
+- Adding field protection in parsing
+- Sorting fields in Markdown table formatter in Siembol response
+- Adding metadata fields to enrichment tables
+- Adding gauge type in Siembol common metrics
+- Upgrading alerting spark dependencies and refactoring to be more generic
+- Adding time exclusion evaluator in Siembol response
+- Adding json path extractor in parsing
+- Fixing computing desired state in config editor rest sync service
+- Rejecting rules with only negated matchers in alerting
+- Adding optional items in Siembol UI and configurations
+
 ## [2.4.0] - 2022-04-29
 
 - Upgrading to Java 17 in java modules
diff --git a/alerting/alerting-core/pom.xml b/alerting/alerting-core/pom.xml
index 523bcdf2f..c98f8c5f7 100644
--- a/alerting/alerting-core/pom.xml
+++ b/alerting/alerting-core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>alerting</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/alerting/alerting-spark/pom.xml b/alerting/alerting-spark/pom.xml
index ee1ba5368..111b402c5 100644
--- a/alerting/alerting-spark/pom.xml
+++ b/alerting/alerting-spark/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>alerting</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>alerting-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jackson-databind</artifactId>
diff --git a/alerting/alerting-storm/pom.xml b/alerting/alerting-storm/pom.xml
index 3e7b876d0..e2ee22e9c 100644
--- a/alerting/alerting-storm/pom.xml
+++ b/alerting/alerting-storm/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>alerting</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>alerting-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/alerting/pom.xml b/alerting/pom.xml
index 5796d8d46..aec558ff2 100644
--- a/alerting/pom.xml
+++ b/alerting/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <modules>
         <module>alerting-core</module>
diff --git a/config-editor/config-editor-core/pom.xml b/config-editor/config-editor-core/pom.xml
index a3bf6ec25..e06518b1e 100644
--- a/config-editor/config-editor-core/pom.xml
+++ b/config-editor/config-editor-core/pom.xml
@@ -9,13 +9,13 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>config-editor</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/config-editor/config-editor-rest/pom.xml b/config-editor/config-editor-rest/pom.xml
index ca81123fc..b47d73842 100644
--- a/config-editor/config-editor-rest/pom.xml
+++ b/config-editor/config-editor-rest/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>config-editor</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencyManagement>
         <dependencies>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -67,22 +67,22 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>config-editor-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>config-editor-services</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>config-editor-sync</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>alerting-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>parsing-app</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>enriching-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>responding-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/config-editor/config-editor-services/pom.xml b/config-editor/config-editor-services/pom.xml
index f7c1363f9..03556aabb 100644
--- a/config-editor/config-editor-services/pom.xml
+++ b/config-editor/config-editor-services/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>config-editor</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -41,32 +41,32 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>config-editor-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>alerting-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>parsing-app</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>enriching-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>responding-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/config-editor/config-editor-sync/pom.xml b/config-editor/config-editor-sync/pom.xml
index 2ebcd49ce..1ffbbb057 100644
--- a/config-editor/config-editor-sync/pom.xml
+++ b/config-editor/config-editor-sync/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>config-editor</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -20,17 +20,17 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>config-editor-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>parsing-app</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/config-editor/config-editor-ui/package.json b/config-editor/config-editor-ui/package.json
index 72b94ed34..15027e115 100644
--- a/config-editor/config-editor-ui/package.json
+++ b/config-editor/config-editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rule-editor.ui",
-  "version": "2.5.4-dev",
+  "version": "2.5.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
diff --git a/config-editor/pom.xml b/config-editor/pom.xml
index 1792c9d25..0a2a623b7 100644
--- a/config-editor/pom.xml
+++ b/config-editor/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <modules>
         <module>config-editor-core</module>
diff --git a/deployment/siembol-monitoring/pom.xml b/deployment/siembol-monitoring/pom.xml
index e03fa4c50..49a3f2680 100644
--- a/deployment/siembol-monitoring/pom.xml
+++ b/deployment/siembol-monitoring/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencyManagement>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/deployment/storm-topology-manager/pom.xml b/deployment/storm-topology-manager/pom.xml
index 56daaa394..94dfa8c1f 100644
--- a/deployment/storm-topology-manager/pom.xml
+++ b/deployment/storm-topology-manager/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencyManagement>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/enriching/enriching-core/pom.xml b/enriching/enriching-core/pom.xml
index d5da8474d..b10489490 100644
--- a/enriching/enriching-core/pom.xml
+++ b/enriching/enriching-core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>enriching</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -35,12 +35,12 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>alerting-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/enriching/enriching-storm/pom.xml b/enriching/enriching-storm/pom.xml
index 63c6b6d19..f0c0dca87 100644
--- a/enriching/enriching-storm/pom.xml
+++ b/enriching/enriching-storm/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>enriching</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>enriching-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/enriching/pom.xml b/enriching/pom.xml
index fa187402a..57e03ad00 100644
--- a/enriching/pom.xml
+++ b/enriching/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <modules>
         <module>enriching-core</module>
diff --git a/parsing/parsing-app/pom.xml b/parsing/parsing-app/pom.xml
index f081e7aed..295e327d1 100644
--- a/parsing/parsing-app/pom.xml
+++ b/parsing/parsing-app/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>parsing</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>parsing-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/parsing/parsing-core/pom.xml b/parsing/parsing-core/pom.xml
index 78715832d..bd030fa4b 100644
--- a/parsing/parsing-core/pom.xml
+++ b/parsing/parsing-core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>parsing</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/parsing/parsing-storm/pom.xml b/parsing/parsing-storm/pom.xml
index 3eccbb9cd..c3efe4459 100644
--- a/parsing/parsing-storm/pom.xml
+++ b/parsing/parsing-storm/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>parsing</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>parsing-app</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/parsing/pom.xml b/parsing/pom.xml
index 43ca1e393..f2bea0db6 100644
--- a/parsing/pom.xml
+++ b/parsing/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <modules>
         <module>parsing-core</module>
diff --git a/pom.xml b/pom.xml
index 098047449..fb049e98c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>uk.co.gresearch.siembol</groupId>
     <artifactId>siembol</artifactId>
     <name>siembol</name>
-    <version>2.5.15-SNAPSHOT</version>
+    <version>2.5.0</version>
     <description>A scalable, advanced security analytics framework based on open-source big data technologies.</description>
     <inceptionYear>2019</inceptionYear>
     <url>https://siembol.io/</url>
diff --git a/responding/pom.xml b/responding/pom.xml
index cd6403e58..3d73c5457 100644
--- a/responding/pom.xml
+++ b/responding/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <modules>
         <module>responding-core</module>
diff --git a/responding/responding-core/pom.xml b/responding/responding-core/pom.xml
index 7ea532523..0d0201ce2 100644
--- a/responding/responding-core/pom.xml
+++ b/responding/responding-core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>responding</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>
@@ -35,12 +35,12 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>alerting-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
diff --git a/responding/responding-stream/pom.xml b/responding/responding-stream/pom.xml
index ef93e1f2d..3f6578a6e 100644
--- a/responding/responding-stream/pom.xml
+++ b/responding/responding-stream/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>responding</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencyManagement>
         <dependencies>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>siembol-common</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>uk.co.gresearch.siembol</groupId>
             <artifactId>responding-core</artifactId>
-            <version>2.5.15-SNAPSHOT</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
diff --git a/siembol-common/pom.xml b/siembol-common/pom.xml
index 887003316..38cf80b00 100644
--- a/siembol-common/pom.xml
+++ b/siembol-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>uk.co.gresearch.siembol</groupId>
         <artifactId>siembol</artifactId>
-        <version>2.5.15-SNAPSHOT</version>
+        <version>2.5.0</version>
     </parent>
     <dependencies>
         <dependency>