diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 91638c66..9b5d4a5d 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -9,7 +9,7 @@ definitions:
 
   services:
     docker:
-      memory: 16000
+      memory: 24000
 
   steps:
     - step: &fullsuite
@@ -26,6 +26,8 @@ definitions:
           - export DOCKER_HOST=tcp://localhost:2375
           - export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=tcp://localhost:2375
           - export TESTCONTAINERS_RYUK_DISABLED=true
+          - export TESTCONTAINERS_RYUK_CONNECTION_TIMEOUT=60s
+          - export DOCKER_CLIENT_TIMEOUT=120
 
           - rm /etc/apt/apt.conf.d/docker-clean || true
           - apt-get update
@@ -59,6 +61,8 @@ definitions:
           - export DOCKER_HOST=tcp://localhost:2375
           - export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=tcp://localhost:2375
           - export TESTCONTAINERS_RYUK_DISABLED=true
+          - export TESTCONTAINERS_RYUK_CONNECTION_TIMEOUT=60s
+          - export DOCKER_CLIENT_TIMEOUT=120
           - export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:-us-east-1}
           - export IMAGE_TAG=$ECR_REGISTRY/doczy/query-orchestration:$BITBUCKET_COMMIT
           - export AWS_WEB_IDENTITY_TOKEN_FILE=$(pwd)/web-identity-token