diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1e269d501..23ec9f773 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,11 +16,12 @@ jobs:
         run: |
           export DOCKER_HOST="unix://${{ matrix.runtime }}"
           echo "Using ${DOCKER_HOST}"
-          go test -race -timeout 30m -coverprofile=coverage.txt -covermode=atomic ./...
+          go test -race -timeout 0 -coverprofile=coverage.txt -covermode=atomic ./...
       - name: Coverage
         uses: codecov/codecov-action@v3
         with:
           file: coverage.txt
+
   linter:
     runs-on: ubuntu-latest
     permissions:
@@ -32,12 +33,14 @@ jobs:
         with:
           go-version: '^1.21'
       - uses: golangci/golangci-lint-action@v3
+
   advanced-security:
     runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
       security-events: write
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -48,6 +51,7 @@ jobs:
           languages: 'go'
       - uses: github/codeql-action/autobuild@v3
       - uses: github/codeql-action/analyze@v3
+
   release:
     needs:
       - test
diff --git a/localstack_test.go b/localstack_test.go
index 7e6c1b98f..89a238f8b 100644
--- a/localstack_test.go
+++ b/localstack_test.go
@@ -95,8 +95,8 @@ func TestWithTimeoutOnStartup(t *testing.T) {
 	containers, err := cli.ContainerList(ctx, types.ContainerListOptions{})
 	require.NoError(t, err)
 	for _, c := range containers {
-		if c.Image == "go-localstack" {
-			t.Fatal("image is still running but should be terminated")
+		if strings.Contains(c.Image, "go-localstack") {
+			t.Fatalf("%s is still running but should be terminated", c.Image)
 		}
 	}
 }
@@ -116,7 +116,7 @@ func TestWithTimeoutAfterStartup(t *testing.T) {
 		containers, err := cli.ContainerList(ctx, types.ContainerListOptions{})
 		require.NoError(t, err)
 		for _, c := range containers {
-			if c.Image == "go-localstack" {
+			if strings.Contains(c.Image, "go-localstack") {
 				return false
 			}
 		}