diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php
index fc4ac9cfca..b31681fd64 100644
--- a/app/config/collections/projects.php
+++ b/app/config/collections/projects.php
@@ -1942,9 +1942,9 @@ return [
         ],
         'indexes' => [
             [
-                '$id' => ID::custom('_key_function'),
+                '$id' => ID::custom('_key_resource'),
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['functionId'],
+                'attributes' => ['resourceInternalId', 'resourceType', 'resourceId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
@@ -2067,6 +2067,17 @@ return [
                 'array' => false,
                 'filters' => ['encrypt']
             ],
+            [
+                '$id' => ID::custom('secret'),
+                'type' => Database::VAR_BOOLEAN,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => false,
+                'default' => false,
+                'array' => false,
+                'filters' => [],
+            ],
             [
                 '$id' => ID::custom('search'),
                 'type' => Database::VAR_STRING,
diff --git a/app/config/runtimes/specifications.php b/app/config/runtimes/specifications.php
index 09068a0d62..d3625db8a2 100644
--- a/app/config/runtimes/specifications.php
+++ b/app/config/runtimes/specifications.php
@@ -10,12 +10,12 @@ return [
     ],
     Specification::S_1VCPU_512MB => [
         'slug' => Specification::S_1VCPU_512MB,
-        'memory' => 4096, // TODO: Revert this, it was just for QA server
+        'memory' => 512,
         'cpus' => 1
     ],
     Specification::S_1VCPU_1GB => [
         'slug' => Specification::S_1VCPU_1GB,
-        'memory' => 4096, // TODO: Revert this, it was just for QA server
+        'memory' => 1024,
         'cpus' => 1
     ],
     Specification::S_2VCPU_2GB => [
diff --git a/phpunit.xml b/phpunit.xml
index 598b730908..4c4e55ea4e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="true"
+         stopOnFailure="false"
 >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index 4801ac3e02..e24f3d26af 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -144,6 +144,11 @@ class Executor
             'x-opr-addressing-method' => 'broadcast'
         ], [], true, 30);
 
+        // Temporary fix for race condition
+        if($response['headers']['status-code'] === 500 && \str_contains($response['body']['message'], 'already in progress')) {
+            return true; // OK, removal already in progress
+        }
+
         $status = $response['headers']['status-code'];
         if ($status >= 400) {
             $message = \is_string($response['body']) ? $response['body'] : $response['body']['message'];