diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c57d50..9d85bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.18.1 - 09/06/2024
+
+ - Fix possible race condition on initialization cleanup when opening a key store
+
 # v1.18.0 - 08/27/2024
 
  - Add Key Value export as text file
diff --git a/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj b/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
index 57f29a5..60fccd0 100644
--- a/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
+++ b/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager Key Generation Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj b/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
index 0086fbc..4f61ffd 100644
--- a/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
+++ b/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager File Key Store Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj b/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
index 1efa75b..b3ae792 100644
--- a/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
+++ b/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager LCP Key Store Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj b/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
index fe78121..bcedd3d 100644
--- a/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
+++ b/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager Plugin UI Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj b/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
index 30fe4a7..8b80f60 100644
--- a/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
+++ b/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
@@ -9,7 +9,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager Plugin Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Library.UI/KeyManager.Library.UI.csproj b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
index 3183cf2..d0be023 100644
--- a/KeyManager.Library.UI/KeyManager.Library.UI.csproj
+++ b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager UI Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Library/KeyManager.Library.csproj b/KeyManager.Library/KeyManager.Library.csproj
index f628b02..827843a 100644
--- a/KeyManager.Library/KeyManager.Library.csproj
+++ b/KeyManager.Library/KeyManager.Library.csproj
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Leosac.$(AssemblyName)</PackageId>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Leosac Key Manager Core Library</Title>
     <Company>Leosac SAS</Company>
     <Product>Leosac Key Manager</Product>
diff --git a/KeyManager.Setup/config.wxi b/KeyManager.Setup/config.wxi
index 376e01c..9e10b61 100644
--- a/KeyManager.Setup/config.wxi
+++ b/KeyManager.Setup/config.wxi
@@ -1,7 +1,7 @@
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define Manufacturer = "Leosac" ?>
     <?define ProductName = "Leosac Key Manager" ?>
-	  <?define Version = "1.18.0.0" ?>
+	  <?define Version = "1.18.1.0" ?>
     <?define AboutURL = "https://www.leosac.com" ?>
     <?define SupportURL = "https://www.leosac.com" ?>
     <?define UpdatesURL = "https://www.leosac.com" ?>
diff --git a/KeyManager/KeyManager.csproj b/KeyManager/KeyManager.csproj
index 234fd2b..53497b6 100644
--- a/KeyManager/KeyManager.csproj
+++ b/KeyManager/KeyManager.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-	  <Version>1.18.0</Version>
+	  <Version>1.18.1</Version>
 	  <Product>Leosac Key Manager</Product>
 	  <Description>Key Manager for Access Control and RFID related technologies, by Leosac.</Description>
 	  <Company>Leosac SAS</Company>
diff --git a/latestversion b/latestversion
index 1d30aac..3f392e7 100644
--- a/latestversion
+++ b/latestversion
@@ -1,4 +1,4 @@
 {
-   "VersionString": "1.18.0",
-   "Uri": "https://download.leosac.com/lkm/KeyManager.Setup-1.18.0.msi"
+   "VersionString": "1.18.1",
+   "Uri": "https://download.leosac.com/lkm/KeyManager.Setup-1.18.1.msi"
 }
\ No newline at end of file