diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index e2f000cf7e..de1513d198 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -178,6 +178,7 @@ jobs:
 
       - name: Pull testcontainers images
         run: |
+          docker system prune -f 
           if [ "${{ matrix.datasource }}" == "mssql" ]; then
             docker pull mcr.microsoft.com/mssql/server@${{ steps.dotenv.outputs.MSSQL_SHA }}
           elif [ "${{ matrix.datasource }}" == "mysql" ]; then
diff --git a/packages/backend-core/tests/core/utilities/testContainerUtils.ts b/packages/backend-core/tests/core/utilities/testContainerUtils.ts
index 4a60ce6eb3..f97d657c8c 100644
--- a/packages/backend-core/tests/core/utilities/testContainerUtils.ts
+++ b/packages/backend-core/tests/core/utilities/testContainerUtils.ts
@@ -39,7 +39,6 @@ function getTestcontainers(): ContainerInfo[] {
 
 function removeContainer(container: ContainerInfo) {
   execSync(`docker rm -f ${container.ID}`)
-  execSync(`docker system prune -f`)
 }
 
 export function getContainerByImage(image: string) {
@@ -55,7 +54,9 @@ export function getContainerByImage(image: string) {
 }
 
 function getContainerByName(name: string) {
-  return getTestcontainers().find(x => x.Names.includes(name))
+  return getTestcontainers().find(x =>
+    x.Names.toLowerCase().includes(name.toLowerCase())
+  )
 }
 
 export function getContainerById(id: string) {