diff --git a/docker/buildkite/docker-compose.yaml b/docker/buildkite/docker-compose.yaml
index 303f72c44..c439c4c21 100644
--- a/docker/buildkite/docker-compose.yaml
+++ b/docker/buildkite/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
   cassandra:
-    image: cassandra:3.11
+    image: cassandra:4.1.3
     deploy:
       resources:
         limits:
diff --git a/src/test/java/com/uber/cadence/internal/replay/ReplayDeciderCacheTests.java b/src/test/java/com/uber/cadence/internal/replay/ReplayDeciderCacheTests.java
index e61a9fa03..e790bec59 100644
--- a/src/test/java/com/uber/cadence/internal/replay/ReplayDeciderCacheTests.java
+++ b/src/test/java/com/uber/cadence/internal/replay/ReplayDeciderCacheTests.java
@@ -103,7 +103,7 @@ public void whenHistoryIsFullNewReplayDeciderIsReturned_InitiallyCached() throws
     service.close();
   }
 
-  @Test(timeout = 7000)
+  @Test(timeout = 8000)
   public void whenHistoryIsPartialCachedEntryIsReturned() throws Exception {
     // Arrange
     Map<String, String> tags =