diff --git a/CDP4WebServer/CDP4WebServer.csproj b/CDP4WebServer/CDP4WebServer.csproj
index 13eb2e4c..9d954efe 100644
--- a/CDP4WebServer/CDP4WebServer.csproj
+++ b/CDP4WebServer/CDP4WebServer.csproj
@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4WebServer-CE</Title>
-    <Version>7.0.5</Version>
+    <Version>7.0.6</Version>
     <Description>CDP4 Services Host</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron, Alexander</Authors>
diff --git a/CDP4WebServer/Program.cs b/CDP4WebServer/Program.cs
index 9b27ce15..2b9a9eaf 100644
--- a/CDP4WebServer/Program.cs
+++ b/CDP4WebServer/Program.cs
@@ -60,7 +60,7 @@ public static int Main(string[] args)
             try
             {
                 Logger.Info("################################################################");
-                Logger.Info($"Starting CDP4 Services v{Assembly.GetEntryAssembly().GetName().Version}");
+                Logger.Info($"Starting COMET Services v{Assembly.GetEntryAssembly()?.GetName().Version}");
 
                 // load application configuration from file
                 AppConfig.Load();
@@ -88,14 +88,14 @@ public static int Main(string[] args)
                 {
                     if (IsRunningOnMono())
                     {
-                        Logger.Info("CDP4 Services Running on Mono Runtime @ {0}", hostString);
+                        Logger.Info("COMET Services Running on Mono Runtime @ {0}", hostString);
 
                         var terminationSignals = GetUnixTerminationSignals();
                         UnixSignal.WaitAny(terminationSignals);
                     }
                     else
                     {
-                        Logger.Info("CDP4 Services Running on .NET Runtime @ {0}", hostString);
+                        Logger.Info("COMET Services Running on .NET Runtime @ {0}", hostString);
 
                         Console.WriteLine("Running on {0}", hostString);
                         Console.WriteLine("Press enter to exit");
@@ -117,7 +117,7 @@ public static int Main(string[] args)
                 }
 
                 // global catch all
-                Logger.Fatal(ex, "The CDP4 Services encountered an unrecoverable error");
+                Logger.Fatal(ex, "The COMET Services encountered an unrecoverable error");
                 return 42;
             }
         }
diff --git a/CDP4WebServices.API/CDP4WebServices.API.csproj b/CDP4WebServices.API/CDP4WebServices.API.csproj
index 2edc8bb9..2d76c387 100644
--- a/CDP4WebServices.API/CDP4WebServices.API.csproj
+++ b/CDP4WebServices.API/CDP4WebServices.API.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net472</TargetFramework>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4WebServices-CE.API</Title>
-    <Version>7.0.5</Version>
+    <Version>7.0.6</Version>
     <Description>Library that contains the CDP4 Services API</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron, Alexander</Authors>