diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12f6c80..dac6a56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning (SemVer)](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.4.0]
+
 ### Added
 
 * Plug-in interface to create several services based on configuration
@@ -32,4 +34,5 @@ First pre-release.
 
 
 [Unreleased]: https://github.com/aposin/gem/tree/main
+[0.4.0]: https://github.com/aposin/gem/releases/tag/v0.4.0
 [0.3.0]: https://github.com/aposin/gem/releases/tag/v0.3.0
diff --git a/bundles/org.aposin.gem.core/META-INF/MANIFEST.MF b/bundles/org.aposin.gem.core/META-INF/MANIFEST.MF
index 9dcf948..325c7b7 100644
--- a/bundles/org.aposin.gem.core/META-INF/MANIFEST.MF
+++ b/bundles/org.aposin.gem.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEM Core
 Bundle-SymbolicName: org.aposin.gem.core;singleton:=true
-Bundle-Version: 0.3.1.qualifier
+Bundle-Version: 0.4.0.qualifier
 Automatic-Module-Name: org.aposin.gem.core
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Association for the promotion of open-source insurance software and for the establishment of open interface standards in the insurance industry (Verein zur Foerderung quelloffener Versicherungssoftware und Etablierung offener Schnittstellenstandards in der Versicherungsbranche)
diff --git a/bundles/org.aposin.gem.core/pom.xml b/bundles/org.aposin.gem.core/pom.xml
index 27f8633..b67c496 100644
--- a/bundles/org.aposin.gem.core/pom.xml
+++ b/bundles/org.aposin.gem.core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.bundles</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 
 	<name>GEM Core</name>
diff --git a/bundles/org.aposin.gem.github/META-INF/MANIFEST.MF b/bundles/org.aposin.gem.github/META-INF/MANIFEST.MF
index 273da14..3e5fb5d 100644
--- a/bundles/org.aposin.gem.github/META-INF/MANIFEST.MF
+++ b/bundles/org.aposin.gem.github/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEM Github Itegration
 Bundle-SymbolicName: org.aposin.gem.github
-Bundle-Version: 0.3.1.qualifier
+Bundle-Version: 0.4.0.qualifier
 Bundle-Activator: org.aposin.gem.github.Activator
 Require-Bundle: org.aposin.gem.core,
  org.aposin.gem.ui
diff --git a/bundles/org.aposin.gem.logging/META-INF/MANIFEST.MF b/bundles/org.aposin.gem.logging/META-INF/MANIFEST.MF
index 9dacf8c..1095e20 100644
--- a/bundles/org.aposin.gem.logging/META-INF/MANIFEST.MF
+++ b/bundles/org.aposin.gem.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEM Logging
 Bundle-SymbolicName: org.aposin.gem.logging
-Bundle-Version: 0.3.1.qualifier
+Bundle-Version: 0.4.0.qualifier
 Bundle-Activator: org.aposin.gem.logging.Activator
 Bundle-Vendor: Association for the promotion of open-source insurance software and for the establishment of open interface standards in the insurance industry (Verein zur Foerderung quelloffener Versicherungssoftware und Etablierung offener Schnittstellenstandards in der Versicherungsbranche)
 Require-Bundle: org.slf4j.api,
diff --git a/bundles/org.aposin.gem.oomph/META-INF/MANIFEST.MF b/bundles/org.aposin.gem.oomph/META-INF/MANIFEST.MF
index 5e1533e..891d87b 100644
--- a/bundles/org.aposin.gem.oomph/META-INF/MANIFEST.MF
+++ b/bundles/org.aposin.gem.oomph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEM Eclipse-Oomph Integration
 Bundle-SymbolicName: org.aposin.gem.oomph;singleton:=true
-Bundle-Version: 0.3.1.qualifier
+Bundle-Version: 0.4.0.qualifier
 Automatic-Module-Name: org.aposin.gem.oomph
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Association for the promotion of open-source insurance software and for the establishment of open interface standards in the insurance industry (Verein zur Foerderung quelloffener Versicherungssoftware und Etablierung offener Schnittstellenstandards in der Versicherungsbranche)
diff --git a/bundles/org.aposin.gem.tortoisegit/META-INF/MANIFEST.MF b/bundles/org.aposin.gem.tortoisegit/META-INF/MANIFEST.MF
index 335da67..0d2d7dc 100644
--- a/bundles/org.aposin.gem.tortoisegit/META-INF/MANIFEST.MF
+++ b/bundles/org.aposin.gem.tortoisegit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEM Integration for TortoiseGit
 Bundle-SymbolicName: org.aposin.gem.tortoisegit;singleton:=true
-Bundle-Version: 0.3.1.qualifier
+Bundle-Version: 0.4.0.qualifier
 Bundle-Activator: org.aposin.gem.tortoisegit.Activator
 Require-Bundle: org.aposin.gem.core,
  org.aposin.gem.ui
diff --git a/bundles/org.aposin.gem.ui/META-INF/MANIFEST.MF b/bundles/org.aposin.gem.ui/META-INF/MANIFEST.MF
index 840f765..cd1b755 100644
--- a/bundles/org.aposin.gem.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.aposin.gem.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEM Core UI
 Bundle-SymbolicName: org.aposin.gem.ui;singleton:=true
-Bundle-Version: 0.3.1.qualifier
+Bundle-Version: 0.4.0.qualifier
 Bundle-Activator: org.aposin.gem.ui.Activator
 Require-Bundle: org.aposin.gem.core,
  org.aposin.gem.logging,
diff --git a/bundles/org.aposin.gem.ui/pom.xml b/bundles/org.aposin.gem.ui/pom.xml
index 57f4490..15ece35 100644
--- a/bundles/org.aposin.gem.ui/pom.xml
+++ b/bundles/org.aposin.gem.ui/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.bundles</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 
 	<name>GEM UI</name>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 482c45f..bf13c9d 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.root</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.aposin.gem.bundles</artifactId>
diff --git a/features/org.aposin.gem.core.feature/feature.xml b/features/org.aposin.gem.core.feature/feature.xml
index 1d9b126..dc45548 100644
--- a/features/org.aposin.gem.core.feature/feature.xml
+++ b/features/org.aposin.gem.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.aposin.gem.core.feature"
       label="GEM Core Feature"
-      version="0.3.1.qualifier"
+      version="0.4.0.qualifier"
       provider-name="Association for the promotion of open-source insurance software and for the establishment of open interface standards in the insurance industry (Verein zur Foerderung quelloffener Versicherungssoftware und Etablierung offener Schnittstellenstandards in der Versicherungsbranche)">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.aposin.gem.extras.feature/feature.xml b/features/org.aposin.gem.extras.feature/feature.xml
index cdaf714..bea2448 100644
--- a/features/org.aposin.gem.extras.feature/feature.xml
+++ b/features/org.aposin.gem.extras.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.aposin.gem.extras.feature"
       label="GEM Extras Feature"
-      version="0.3.1.qualifier"
+      version="0.4.0.qualifier"
       provider-name="Association for the promotion of open-source insurance software and for the establishment of open interface standards in the insurance industry (Verein zur Foerderung quelloffener Versicherungssoftware und Etablierung offener Schnittstellenstandards in der Versicherungsbranche)">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.aposin.gem.thirdparty.feature/feature.xml b/features/org.aposin.gem.thirdparty.feature/feature.xml
index 1a7aec5..1814b49 100644
--- a/features/org.aposin.gem.thirdparty.feature/feature.xml
+++ b/features/org.aposin.gem.thirdparty.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.aposin.gem.thirdparty.feature"
       label="GEM Thirdparty Components"
-      version="0.3.1.qualifier"
+      version="0.4.0.qualifier"
       provider-name="Association for the promotion of open-source insurance software and for the establishment of open interface standards in the insurance industry (Verein zur Foerderung quelloffener Versicherungssoftware und Etablierung offener Schnittstellenstandards in der Versicherungsbranche)">
 
    <description>
diff --git a/features/pom.xml b/features/pom.xml
index ab77160..c97e095 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.root</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.aposin.gem.features</artifactId>
diff --git a/pom.xml b/pom.xml
index 41d1d7e..5c40e1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	
 	<artifactId>org.aposin.gem.root</artifactId>
 	<packaging>pom</packaging>
-	<version>0.3.1-SNAPSHOT</version>
+	<version>0.4.0-SNAPSHOT</version>
 	
 	<modules>
 		<module>bundles</module>
diff --git a/products/org.aposin.gem.product/org.aposin.gem.ui.product b/products/org.aposin.gem.product/org.aposin.gem.ui.product
index f216a6b..bafe2aa 100644
--- a/products/org.aposin.gem.product/org.aposin.gem.ui.product
+++ b/products/org.aposin.gem.product/org.aposin.gem.ui.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="org.aposin.gem.ui" uid="GEM" id="org.aposin.gem.ui.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="0.3.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="org.aposin.gem.ui" uid="GEM" id="org.aposin.gem.ui.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="0.4.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -10,7 +10,7 @@
       <vmArgs>-Xmx75M
 -Dswt.autoScale=true
 -Dorg.aposin.gem.gitconfig.url=git@github.com:aposin/gem-config.git
--Dorg.aposin.gem.gitconfig.branch=main
+-Dorg.aposin.gem.gitconfig.branch=v0.4.0
 -Dorg.aposin.gem.gitconfig.file=root.conf
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
diff --git a/products/org.aposin.gem.product/pom.xml b/products/org.aposin.gem.product/pom.xml
index d4b31ad..4052287 100644
--- a/products/org.aposin.gem.product/pom.xml
+++ b/products/org.aposin.gem.product/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.products</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.aposin.gem.product</artifactId>
diff --git a/products/pom.xml b/products/pom.xml
index 970145d..c23eb0f 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.root</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.aposin.gem.products</artifactId>
diff --git a/releng/org.aposin.gem.targetdefinition/pom.xml b/releng/org.aposin.gem.targetdefinition/pom.xml
index 419a4d3..4830401 100644
--- a/releng/org.aposin.gem.targetdefinition/pom.xml
+++ b/releng/org.aposin.gem.targetdefinition/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.releng</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.aposin.gem.targetdefinition</artifactId>
diff --git a/releng/pom.xml b/releng/pom.xml
index e21d3bf..8d8f25a 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.root</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.aposin.gem.releng</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 3136fe3..9e99295 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.aposin.gem</groupId>
 		<artifactId>org.aposin.gem.root</artifactId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.aposin.gem.test</artifactId>