diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1761b8769..7b819453c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,11 @@
 Improvements:
 - Added .NET 7.0 support
 - Updated [System.Data.SqlClient] version to 4.8.5
-- Updated [NHibernate] version to 5.4.0
+- Updated [NHibernate] version to 5.4.3
 
 Breaking Changes:
-- Upgraded [Castle.Core] version to 5.1.0 (TBD)
-- Upgraded [Castle.Windsor] version to 6.0.0 (TBD)
+- Upgraded [Castle.Core] version to 5.1.1
+- Upgraded [Castle.Windsor] version to 6.0.0
 - Upgraded [Castle.Services.Transaction] version to 5.4.0
 - Upgraded [Castle.Facilities.AutoTx] version to 5.4.0
 
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj b/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
index 0836f0c38..dfee7d2d8 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
@@ -15,11 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="[4.4.1,5)" />
+    <PackageReference Include="Castle.Core" Version="[5.1.1,6)" />
     <PackageReference Include="Castle.Facilities.AutoTx" Version="[5.4.0,5.5)" />
-    <PackageReference Include="Castle.LoggingFacility" Version="[5.1.2,6)" />
     <PackageReference Include="Castle.Services.Transaction" Version="[5.4.0,5.5)" />
-    <PackageReference Include="Castle.Windsor" Version="[5.1.2,6)" />
+    <PackageReference Include="Castle.Windsor" Version="[6,7)" />
     <PackageReference Include="FluentAssertions" Version="6.10.0" />
     <PackageReference Include="LiquidTestReports.Markdown" Version="1.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs
index 8b33d2e7d..5e3b73b05 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs
@@ -93,21 +93,21 @@ public void ExceptionOnEndWithTwoDatabases()
             {
                 foreach (var resource in e.FailedResources)
                 {
-                    Console.WriteLine(resource.Second);
+                    Console.WriteLine(resource.Item2);
                 }
 
                 throw;
             }
 
             var blogs = service.FindAll(typeof(Blog));
-            var blogitems = service.FindAll(typeof(BlogItem));
+            var blogItems = service.FindAll(typeof(BlogItem));
             var orders = orderDao.FindAll(typeof(Order));
 
             Assert.That(blogs, Is.Not.Null);
-            Assert.That(blogitems, Is.Not.Null);
+            Assert.That(blogItems, Is.Not.Null);
             Assert.That(orders, Is.Not.Null);
             Assert.That(blogs.Length, Is.EqualTo(0));
-            Assert.That(blogitems.Length, Is.EqualTo(0));
+            Assert.That(blogItems.Length, Is.EqualTo(0));
             Assert.That(orders.Length, Is.EqualTo(0));
         }
 
@@ -164,21 +164,21 @@ public void ExceptionOnEndWithTwoDatabasesStateless()
             {
                 foreach (var resource in e.FailedResources)
                 {
-                    Console.WriteLine(resource.Second);
+                    Console.WriteLine(resource.Item2);
                 }
 
                 throw;
             }
 
             var blogs = service.FindAllStateless(typeof(Blog));
-            var blogitems = service.FindAllStateless(typeof(BlogItem));
+            var blogItems = service.FindAllStateless(typeof(BlogItem));
             var orders = orderDao.FindAllStateless(typeof(Order));
 
             Assert.That(blogs, Is.Not.Null);
-            Assert.That(blogitems, Is.Not.Null);
+            Assert.That(blogItems, Is.Not.Null);
             Assert.That(orders, Is.Not.Null);
             Assert.That(blogs.Length, Is.EqualTo(0));
-            Assert.That(blogitems.Length, Is.EqualTo(0));
+            Assert.That(blogItems.Length, Is.EqualTo(0));
             Assert.That(orders.Length, Is.EqualTo(0));
         }
     }
diff --git a/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj b/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj
index 489c3fa73..5fbf18886 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj
+++ b/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj
@@ -17,9 +17,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="[4.4.1,5)" />
+    <PackageReference Include="Castle.Core" Version="[5.1.1,6)" />
     <PackageReference Include="Castle.Services.Transaction" Version="[5.4.0,5.5)" />
-    <PackageReference Include="Castle.Windsor" Version="[5.1.2,6)" />
+    <PackageReference Include="Castle.Windsor" Version="[6,7)" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NHibernate" Version="5.4.1" />
     <PackageReference Include="System.Text.Json" Version="7.0.2" />