diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 24787fb484..d02bcd8751 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1050,7 +1050,7 @@ App::post('/v1/account/sessions/anonymous')
     ->label('scope', 'public')
     ->label('auth.type', 'anonymous')
     ->label('audits.resource', 'user/{response.userId}')
-    ->label('audits.userId', '{userId}')
+    ->label('audits.userId', '{user.userId}')
     ->label('sdk.auth', [])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createAnonymousSession')
@@ -2046,7 +2046,7 @@ App::post('/v1/account/verification')
     ->label('scope', 'account')
     ->label('event', 'users.[userId].verification.[tokenId].create')
     ->label('audits.resource', 'user/{response.userId}')
-    ->label('audits.userId', '{userId}')
+    ->label('audits.userId', '{user.userId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createVerification')
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 8b81b60f57..d1271beb44 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -347,7 +347,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
     ->desc('Update Function Deployment')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
-    ->label('audits.resource', 'function/{request.functionId}/deployment/{request.deploymentId}')
+    ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'updateDeployment')
@@ -451,7 +451,7 @@ App::post('/v1/functions/:functionId/deployments')
     ->desc('Create Deployment')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].create')
-    ->label('audits.resource', 'function/{request.functionId}/deployment/{response.$id}')
+    ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'createDeployment')
@@ -733,7 +733,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
     ->desc('Delete Deployment')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].delete')
-    ->label('audits.resource', 'function/{request.functionId}/deployment/{request.deploymentId}')
+    ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'deleteDeployment')
@@ -1069,7 +1069,7 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
     ->desc('Retry Build')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
-    ->label('audits.resource', 'function/{request.functionId}/deployment/{request.deploymentId}/build/{request.buildId}')
+    ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'retryBuild')