diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 594dee006a..c41d105d06 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -48,7 +48,7 @@ App::post('/v1/storage/buckets')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
     ->label('event', 'buckets.[bucketId].create')
-    ->label('audits.resource', 'buckets/{response.$id}')
+    ->label('audits.resource', 'bucket/{response.$id}')
     ->label('usage.metric', 'buckets.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
@@ -219,7 +219,7 @@ App::put('/v1/storage/buckets/:bucketId')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
     ->label('event', 'buckets.[bucketId].update')
-    ->label('audits.resource', 'buckets/{response.$id}')
+    ->label('audits.resource', 'bucket/{response.$id}')
     ->label('usage.metric', 'buckets.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
@@ -285,7 +285,7 @@ App::delete('/v1/storage/buckets/:bucketId')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
     ->label('event', 'buckets.[bucketId].delete')
-    ->label('audits.resource', 'buckets/{request.bucketId}')
+    ->label('audits.resource', 'bucket/{request.bucketId}')
     ->label('usage.metric', 'buckets.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
@@ -327,7 +327,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
     ->label('event', 'buckets.[bucketId].files.[fileId].create')
-    ->label('audits.resource', 'files/{response.$id}')
+    ->label('audits.resource', 'file/{response.$id}')
     ->label('usage.metric', 'files.{scope}.requests.create')
     ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
@@ -1238,7 +1238,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
     ->label('event', 'buckets.[bucketId].files.[fileId].update')
-    ->label('audits.resource', 'files/{response.$id}')
+    ->label('audits.resource', 'file/{response.$id}')
     ->label('usage.metric', 'files.{scope}.requests.update')
     ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
diff --git a/tests/e2e/Services/Account/AccountBase.php b/tests/e2e/Services/Account/AccountBase.php
index 90254a1489..69ac671167 100644
--- a/tests/e2e/Services/Account/AccountBase.php
+++ b/tests/e2e/Services/Account/AccountBase.php
@@ -1185,6 +1185,7 @@ trait AccountBase
     /**
      * @depends testCreateAccountRecovery
      */
+    #[Retry(count: 1)]
     public function testUpdateAccountRecovery($data): array
     {
         $id = $data['id'] ?? '';