diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 7fa3c692b1..d00837d201 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-ce85973ea37c951bb7e3260ae1c262fbc2011f76
\ No newline at end of file
+4011644daea63877e43ebc20cbe6704f381b4b42
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index a29f0e16cc..6ee5a9651c 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -15374,6 +15374,8 @@ components:
     AuditLog:
       type: object
       properties:
+        workspace_id:
+          type: string
         id:
           type: integer
         timestamp:
@@ -15479,6 +15481,7 @@ components:
         span:
           type: string
       required:
+        - workspace_id
         - id
         - timestamp
         - username
diff --git a/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte b/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
index 63f018304a..c5289dc413 100644
--- a/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
+++ b/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
@@ -260,6 +260,9 @@
 		USERS_ADD_GLOBAL: 'users.add_global',
 		USERS_IMPERSONATE: 'users.impersonate',
 		USERS_LEAVE_WORKSPACE: 'users.leave_workspace',
+		USERS_SCIM_CREATE: 'users.scim_create',
+		USERS_SCIM_DELETE: 'users.scim_delete',
+		USERS_SCIM_UPDATE: 'users.scim_update',
 		OAUTH_LOGIN: 'oauth.login',
 		OAUTH_LOGIN_FAILURE: 'oauth.login_failure',
 		OAUTH_SIGNUP: 'oauth.signup',
@@ -287,6 +290,9 @@
 		IGROUP_DELETE: 'igroup.delete',
 		IGROUP_ADDUSER: 'igroup.adduser',
 		IGROUP_REMOVEUSER: 'igroup.removeuser',
+		INSTANCE_GROUPS_SCIM_CREATE: 'instance_groups.scim_create',
+		INSTANCE_GROUPS_SCIM_DELETE: 'instance_groups.scim_delete',
+		INSTANCE_GROUPS_SCIM_UPDATE: 'instance_groups.scim_update',
 		VARIABLES_DECRYPT_SECRET: 'variables.decrypt_secret',
 		WORKSPACES_EDIT_COMMAND_SCRIPT: 'workspaces.edit_command_script',
 		WORKSPACES_EDIT_DEPLOY_TO: 'workspaces.edit_deploy_to',
diff --git a/frontend/src/lib/components/auditLogs/AuditLogsTable.svelte b/frontend/src/lib/components/auditLogs/AuditLogsTable.svelte
index 3412f1dba2..f94164073b 100644
--- a/frontend/src/lib/components/auditLogs/AuditLogsTable.svelte
+++ b/frontend/src/lib/components/auditLogs/AuditLogsTable.svelte
@@ -18,6 +18,7 @@
 		selectedId?: number | undefined
 		usernameFilter?: string | undefined
 		resourceFilter?: string | undefined
+		showWorkspace?: boolean
 		onselect?: (id: number) => void
 	}
 
@@ -31,6 +32,7 @@
 		selectedId = undefined,
 		usernameFilter = $bindable(),
 		resourceFilter = $bindable(),
+		showWorkspace = false,
 		onselect
 	}: Props = $props()
 
@@ -128,9 +130,12 @@
 			class="flex flex-row bg-surface-secondary sticky top-0 w-full p-2 pr-4 text-xs font-semibold"
 		>
 			<div class="w-1/12">ID</div>
-			<div class="w-3/12">Timestamp</div>
-			<div class="w-3/12">Username</div>
-			<div class="w-3/12">Operation</div>
+			<div class={showWorkspace ? "w-2/12" : "w-3/12"}>Timestamp</div>
+			<div class={showWorkspace ? "w-2/12" : "w-3/12"}>Username</div>
+			{#if showWorkspace}
+				<div class="w-2/12">Workspace</div>
+			{/if}
+			<div class={showWorkspace ? "w-2/12" : "w-3/12"}>Operation</div>
 			<div class="w-2/12">Resource</div>
 		</div>
 	</div>
@@ -174,10 +179,10 @@
 									<div class="w-1/12 text-xs truncate">
 										{logOrDate.log.id}
 									</div>
-									<div class="w-3/12 text-xs">
+									<div class={showWorkspace ? "w-2/12 text-xs" : "w-3/12 text-xs"}>
 										{displayDate(logOrDate.log.timestamp)}
 									</div>
-									<div class="w-3/12 text-xs">
+									<div class={showWorkspace ? "w-2/12 text-xs" : "w-3/12 text-xs"}>
 										<div class="flex flex-row gap-2 items-center">
 											<div class="whitespace-nowrap overflow-x-auto no-scrollbar max-w-60">
 												{logOrDate.log.username}
@@ -196,7 +201,14 @@
 											/>
 										</div>
 									</div>
-									<div class="w-3/12 text-xs">
+									{#if showWorkspace}
+										<div class="w-2/12 text-xs">
+											<div class="whitespace-nowrap overflow-x-auto no-scrollbar max-w-60">
+												{logOrDate.log.workspace_id}
+											</div>
+										</div>
+									{/if}
+									<div class={showWorkspace ? "w-2/12 text-xs" : "w-3/12 text-xs"}>
 										<div class="flex flex-row gap-1">
 											<Badge
 												on:click={() => {
diff --git a/frontend/src/routes/(root)/(logged)/audit_logs/+page.svelte b/frontend/src/routes/(root)/(logged)/audit_logs/+page.svelte
index 30fd36ace4..e56a63a4a3 100644
--- a/frontend/src/routes/(root)/(logged)/audit_logs/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/audit_logs/+page.svelte
@@ -170,6 +170,7 @@
 								bind:usernameFilter={username}
 								bind:resourceFilter={resource}
 								bind:hasMore
+								showWorkspace={scope === 'instance' || scope === 'all_workspaces'}
 								onselect={(id) => {
 									selectedId = id
 								}}
@@ -200,6 +201,7 @@
 					bind:operation
 					bind:usernameFilter={username}
 					bind:resourceFilter={resource}
+					showWorkspace={scope === 'instance' || scope === 'all_workspaces'}
 					onselect={(id) => {
 						selectedId = id
 						auditLogDrawer?.openDrawer()