diff --git a/.github/workflows/build.dotnet.testcontainers.yml b/.github/workflows/build.dotnet.testcontainers.yml
index 656126f93..a7103e39b 100644
--- a/.github/workflows/build.dotnet.testcontainers.yml
+++ b/.github/workflows/build.dotnet.testcontainers.yml
@@ -12,7 +12,7 @@ jobs:
 
         steps:
             - name: Check Out Repo
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Setup .NET
               uses: actions/setup-dotnet@v3
diff --git a/.github/workflows/build.dotnet.yml b/.github/workflows/build.dotnet.yml
index 74c033f3b..c0fd50b14 100644
--- a/.github/workflows/build.dotnet.yml
+++ b/.github/workflows/build.dotnet.yml
@@ -12,7 +12,7 @@ jobs:
 
         steps:
             - name: Check Out Repo
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Start containers
               run: docker-compose -f "docker-compose.ci.yml" up -d
diff --git a/.github/workflows/publish.docker.yml b/.github/workflows/publish.docker.yml
index fa0efb6e1..28a98a900 100644
--- a/.github/workflows/publish.docker.yml
+++ b/.github/workflows/publish.docker.yml
@@ -8,7 +8,7 @@ jobs:
 
         steps:
             - name: Check Out Repo
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Login to DockerHub
               uses: docker/login-action@v2
diff --git a/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/Confirming/ConfirmShoppingCartTests.cs b/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/Confirming/ConfirmShoppingCartTests.cs
index cc66ad183..14d4fa729 100644
--- a/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/Confirming/ConfirmShoppingCartTests.cs
+++ b/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/Confirming/ConfirmShoppingCartTests.cs
@@ -36,7 +36,7 @@ public class ConfirmShoppingCartTests: IClassFixture<ConfirmShoppingCartFixture>
 
     [Fact]
     [Trait("Category", "Acceptance")]
-    public async Task Put_Should_Return_OK_And_Cancel_Shopping_Cart()
+    public async Task Put_Should_Return_OK_And_Confirm_Shopping_Cart()
     {
         await API
             .Given()
@@ -45,12 +45,9 @@ await API
                 URI($"/api/ShoppingCarts/{API.ShoppingCartId}/confirmation"),
                 HEADERS(IF_MATCH(0))
             )
-            .Then(OK);
-
-        await API
-            .Given()
-            .When(GET, URI($"/api/ShoppingCarts/{API.ShoppingCartId}"))
-            .Until(RESPONSE_ETAG_IS(1))
+            .Then(OK)
+            .AndWhen(GET, URI($"/api/ShoppingCarts/{API.ShoppingCartId}"))
+            .Until(RESPONSE_ETAG_IS(1), maxNumberOfRetries: 10)
             .Then(
                 OK,
                 RESPONSE_BODY<ShoppingCartDetails>(details =>
diff --git a/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/RemovingProduct/RemoveProductTests.cs b/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/RemovingProduct/RemoveProductTests.cs
index 2c7ce03b7..fb0ddbee5 100644
--- a/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/RemovingProduct/RemoveProductTests.cs
+++ b/Sample/EventStoreDB/Simple/ECommerce.Api.Tests/ShoppingCarts/RemovingProduct/RemoveProductTests.cs
@@ -34,8 +34,8 @@ public async Task InitializeAsync()
             )
             .Then(OK)
             .And()
-            .When(GET, URI(ctx=>$"/api/ShoppingCarts/{ctx.GetCreatedId()}"))
-            .Until(RESPONSE_ETAG_IS(1))
+            .When(GET, URI(ctx => $"/api/ShoppingCarts/{ctx.GetCreatedId()}"))
+            .Until(RESPONSE_ETAG_IS(1), maxNumberOfRetries: 10)
             .Then(OK)
             .GetResponseBody<ShoppingCartDetails>();
 
@@ -60,15 +60,14 @@ await API
             .Given()
             .When(
                 DELETE,
-                URI($"/api/ShoppingCarts/{API.ShoppingCartId}/products/{API.ProductItem.ProductId}?quantity={RemovedCount}&unitPrice={API.UnitPrice.ToString(CultureInfo.InvariantCulture)}"),
+                URI(
+                    $"/api/ShoppingCarts/{API.ShoppingCartId}/products/{API.ProductItem.ProductId}?quantity={RemovedCount}&unitPrice={API.UnitPrice.ToString(CultureInfo.InvariantCulture)}"),
                 HEADERS(IF_MATCH(1))
             )
             .Then(NO_CONTENT)
-
             .And()
-
             .When(GET, URI($"/api/ShoppingCarts/{API.ShoppingCartId}"))
-            .Until(RESPONSE_ETAG_IS(2))
+            .Until(RESPONSE_ETAG_IS(2), maxNumberOfRetries: 10)
             .Then(
                 OK,
                 RESPONSE_BODY<ShoppingCartDetails>(details =>
diff --git a/Workshops/IntroductionToEventSourcing/docker-compose.yml b/Workshops/IntroductionToEventSourcing/docker-compose.yml
index 88662ed60..5da07acb7 100644
--- a/Workshops/IntroductionToEventSourcing/docker-compose.yml
+++ b/Workshops/IntroductionToEventSourcing/docker-compose.yml
@@ -28,9 +28,9 @@ services:
     #  EventStoreDB
     #######################################################
     eventstore.db:
-        image: eventstore/eventstore:22.10.1-buster-slim
+        image: eventstore/eventstore:23.10.0-bookworm-slim
         # use this image if you're running ARM-based proc like Apple M1
-        # image: eventstore/eventstore:22.10.0-alpha-arm64v8
+        # image: eventstore/eventstore:23.10.0-alpha-arm64v8
         environment:
             - EVENTSTORE_CLUSTER_SIZE=1
             - EVENTSTORE_RUN_PROJECTIONS=All
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index b7521c056..fe16f6cc7 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -17,9 +17,9 @@ services:
     #  EventStoreDB
     #######################################################
     eventstore.db:
-        image: eventstore/eventstore:22.10.1-buster-slim
+        image: eventstore/eventstore:23.10.0-bookworm-slim
         # use this image if you're running ARM-based proc like Apple M1
-        # image: eventstore/eventstore:22.10.0-alpha-arm64v8
+        # image: eventstore/eventstore:23.10.0-alpha-arm64v8
         environment:
             - EVENTSTORE_CLUSTER_SIZE=1
             - EVENTSTORE_RUN_PROJECTIONS=All
diff --git a/docker-compose.yml b/docker-compose.yml
index f9ad3a471..e94e99874 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,9 +39,9 @@ services:
     #  EventStoreDB
     #######################################################
     eventstore.db:
-        image: eventstore/eventstore:22.10.1-buster-slim
+        image: eventstore/eventstore:23.10.0-bookworm-slim
         # use this image if you're running ARM-based proc like Apple M1
-        # image: eventstore/eventstore:22.10.0-alpha-arm64v8
+        # image: eventstore/eventstore:23.10.0-alpha-arm64v8
         environment:
             - EVENTSTORE_CLUSTER_SIZE=1
             - EVENTSTORE_RUN_PROJECTIONS=All