diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..78a9c5e3a1
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,58 @@
+version: 2.1
+
+orbs:
+  onegini-build: onegini/onegini-build@3
+
+shared: &shared
+  component_type: library
+  context: dev-context
+  executor:
+    name: onegini-build/maven-builder
+    tag: "17.0"
+  projects: core,test
+
+
+tags_only: &tags_only
+  filters:
+    branches:
+      ignore: /.*/
+    tags:
+      only: /.*/
+
+tags_and_branches_only: &tags_and_branches_only
+  filters:
+    branches:
+      only: /.*/
+    tags:
+      only: /.*/
+
+workflows:
+  version: 2
+  library-workflow:
+    jobs:
+      - onegini-build/build-install:
+          name: build
+          <<: *shared
+          <<: *tags_and_branches_only
+          skip_tests: true
+
+      - onegini-build/test:
+          name: test
+          <<: *shared
+          <<: *tags_and_branches_only
+          requires:
+            - build
+
+      - onegini-build/deploy:
+          name: deploy
+          <<: *shared
+          <<: *tags_and_branches_only
+          requires:
+            - build
+            - test
+
+      - onegini-build/notify-released:
+          context: dev-context
+          <<: *tags_only
+          requires:
+            - deploy
diff --git a/amqp/pom.xml b/amqp/pom.xml
index 29de4120fb..4673fcccb7 100644
--- a/amqp/pom.xml
+++ b/amqp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/pom.xml b/core/pom.xml
index 80a02c2132..28af4c16e3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -19,51 +19,17 @@
     <parent>
         <groupId>org.axonframework</groupId>
         <artifactId>axon</artifactId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>axon-core</artifactId>
     <name>Axon Framework core</name>
 
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix.bundle.plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Description>High Performance and Scalability framework for Java application based on the
-                            CQRS principles
-                        </Bundle-Description>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>
-                            org.axonframework.*
-                        </Export-Package>
-                        <Import-Package>
-                            org.slf4j.*,
-                            *;resolution:=optional
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <!--
-                        This execution makes sure that the manifest is available
-                        when the tests are executed
-                    -->
-                    <execution>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/distributed-commandbus/pom.xml b/distributed-commandbus/pom.xml
index f39ba7b974..af19be5d50 100644
--- a/distributed-commandbus/pom.xml
+++ b/distributed-commandbus/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/documentation/pom.xml b/documentation/pom.xml
index 1d17b4dac4..df1ba0e2cb 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.axonframework</groupId>
         <artifactId>axon</artifactId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>axon-documentation</artifactId>
@@ -128,4 +128,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/incubator/cassandra/pom.xml b/incubator/cassandra/pom.xml
index 26f7664422..2f11f78252 100644
--- a/incubator/cassandra/pom.xml
+++ b/incubator/cassandra/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/incubator/google-app-engine/pom.xml b/incubator/google-app-engine/pom.xml
index d64a1b6521..d06c296e0d 100644
--- a/incubator/google-app-engine/pom.xml
+++ b/incubator/google-app-engine/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -84,4 +84,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/incubator/redis/pom.xml b/incubator/redis/pom.xml
index d2f04d73c0..1c1360287c 100644
--- a/incubator/redis/pom.xml
+++ b/incubator/redis/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -68,4 +68,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/integration/pom.xml b/integration/pom.xml
index 17527374c0..dced6ca038 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -75,4 +75,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/integrationtests/pom.xml b/integrationtests/pom.xml
index 5d24e40e56..87faa389ee 100644
--- a/integrationtests/pom.xml
+++ b/integrationtests/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -211,4 +211,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/mongo/pom.xml b/mongo/pom.xml
index ab5df66b40..58bb047185 100644
--- a/mongo/pom.xml
+++ b/mongo/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.axonframework</groupId>
         <artifactId>axon</artifactId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>axon-mongo</artifactId>
diff --git a/mongo3/pom.xml b/mongo3/pom.xml
index 8dda86a5e1..e3609e8a18 100644
--- a/mongo3/pom.xml
+++ b/mongo3/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.axonframework</groupId>
         <artifactId>axon</artifactId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>axon-mongo3</artifactId>
diff --git a/monitoring-jmx/pom.xml b/monitoring-jmx/pom.xml
index ca8eb294f0..e2ca07127c 100644
--- a/monitoring-jmx/pom.xml
+++ b/monitoring-jmx/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -59,4 +59,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 734b4f7c81..6caafbc1e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,15 @@
 
 <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">
 
+    <parent>
+        <groupId>com.onegini</groupId>
+        <artifactId>og-parent</artifactId>
+        <version>62</version>
+    </parent>
+
     <groupId>org.axonframework</groupId>
     <artifactId>axon</artifactId>
-    <version>2.4.7-SNAPSHOT</version>
+    <version>${revision}</version>
     <modules>
         <module>core</module>
         <module>integration</module>
@@ -117,7 +123,7 @@
         <spring.version>6.1.11</spring.version>
         <spring-security.version>6.3.1</spring-security.version>
         <rabbitmq.version>5.19.0</rabbitmq.version>
-        <felix.bundle.plugin.version>2.4.0</felix.bundle.plugin.version>
+        <felix.bundle.plugin.version>6.0.0</felix.bundle.plugin.version>
         <felix.version>4.2.1</felix.version>
         <pax.exam.version>3.4.0</pax.exam.version>
         <pax.url.version>1.6.0</pax.url.version>
@@ -381,27 +387,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <!-- just to make sure deployed artifacts are always built (and tested) using JDK 6 -->
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-java</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>1.6</version>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/quickstart/pom.xml b/quickstart/pom.xml
index a57d9fc19b..19d844d951 100644
--- a/quickstart/pom.xml
+++ b/quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.axonframework</groupId>
         <artifactId>axon</artifactId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>axon-quickstart</artifactId>
@@ -128,4 +128,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/springmessaging/pom.xml b/springmessaging/pom.xml
index 0b05086467..06d455f08f 100644
--- a/springmessaging/pom.xml
+++ b/springmessaging/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -74,4 +74,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/test/pom.xml b/test/pom.xml
index 8d85172571..28e676c3a7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>axon</artifactId>
         <groupId>org.axonframework</groupId>
-        <version>2.4.7-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>