diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1cf5850dfb..2cb350d195 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -42,4 +42,4 @@ jobs:
       if: always()
       run: |
         docker compose down -v
-        docker ps -q | xargs docker stop
+        docker ps -aq | xargs docker rm --force
diff --git a/tests/e2e/Services/Database/DatabaseBase.php b/tests/e2e/Services/Database/DatabaseBase.php
index 77cb5548cc..1f5c633f1e 100644
--- a/tests/e2e/Services/Database/DatabaseBase.php
+++ b/tests/e2e/Services/Database/DatabaseBase.php
@@ -277,7 +277,7 @@ trait DatabaseBase
         $this->assertEquals(true, $boolean['body']['default']);
 
         // wait for database worker to create attributes
-        sleep(10);
+        sleep(30);
 
         $stringResponse = $this->client->call(Client::METHOD_GET, "/database/collections/{$collectionId}/attributes/{$collectionId}_{$string['body']['key']}",array_merge([
             'content-type' => 'application/json',
diff --git a/tests/e2e/Services/Database/DatabaseCustomServerTest.php b/tests/e2e/Services/Database/DatabaseCustomServerTest.php
index f4e1d48041..d268cb492d 100644
--- a/tests/e2e/Services/Database/DatabaseCustomServerTest.php
+++ b/tests/e2e/Services/Database/DatabaseCustomServerTest.php
@@ -588,7 +588,7 @@ class DatabaseCustomServerTest extends Scope
             $this->assertEquals(201, $attribute['headers']['status-code']);
         }
 
-        sleep(5);
+        sleep(30);
 
         $tooMany = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/integer', array_merge([
             'content-type' => 'application/json',