diff --git a/packages/server/modules/comments/tests/comments.spec.js b/packages/server/modules/comments/tests/comments.spec.js
index 2399407bf..59dcd56df 100644
--- a/packages/server/modules/comments/tests/comments.spec.js
+++ b/packages/server/modules/comments/tests/comments.spec.js
@@ -1298,7 +1298,7 @@ describe('Comments @comments', () => {
 
       before(async () => {
         // Truncate comments
-        truncateTables([Comments.name])
+        await truncateTables([Comments.name])
 
         // Create a single comment with a blob
         const createCommentResult = await createComment({
diff --git a/packages/server/modules/workspaces/domain/operations.ts b/packages/server/modules/workspaces/domain/operations.ts
index 7ab953fde..e96a06575 100644
--- a/packages/server/modules/workspaces/domain/operations.ts
+++ b/packages/server/modules/workspaces/domain/operations.ts
@@ -12,6 +12,7 @@ import { EventBusPayloads } from '@/modules/shared/services/eventBus'
 import {
   MaybeNullOrUndefined,
   Nullable,
+  NullableKeysToOptional,
   Optional,
   PartialNullable,
   StreamRoles,
@@ -22,11 +23,22 @@ import { WorkspaceTeam } from '@/modules/workspaces/domain/types'
 import { Stream } from '@/modules/core/domain/streams/types'
 import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
 import { ServerRegion } from '@/modules/multiregion/domain/types'
+import { SetOptional } from 'type-fest'
 
 /** Workspace */
 
 type UpsertWorkspaceArgs = {
-  workspace: Omit<Workspace, 'domains'>
+  workspace: Omit<
+    SetOptional<
+      NullableKeysToOptional<Workspace>,
+      | 'domainBasedMembershipProtectionEnabled'
+      | 'discoverabilityEnabled'
+      | 'defaultLogoIndex'
+      | 'defaultProjectRole'
+      | 'slug'
+    >,
+    'domains'
+  >
 }
 
 export type UpsertWorkspace = (args: UpsertWorkspaceArgs) => Promise<void>
diff --git a/packages/server/modules/workspaces/tests/integration/repositories.spec.ts b/packages/server/modules/workspaces/tests/integration/repositories.spec.ts
index e83834ff2..4e6b2201b 100644
--- a/packages/server/modules/workspaces/tests/integration/repositories.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/repositories.spec.ts
@@ -161,7 +161,7 @@ describe('Workspace repositories', () => {
       })
 
       afterEach(async () => {
-        truncateTables(['workspaces'])
+        await truncateTables(['workspaces'])
       })
 
       it('returns all workspace members', async () => {
@@ -209,7 +209,7 @@ describe('Workspace repositories', () => {
       })
 
       afterEach(async () => {
-        truncateTables(['workspaces'])
+        await truncateTables(['workspaces'])
       })
 
       it('limits search results to specified workspace', async () => {
diff --git a/packages/server/modules/workspaces/tests/integration/sso.graph.spec.ts b/packages/server/modules/workspaces/tests/integration/sso.graph.spec.ts
index 0e90db119..cdb4d76cb 100644
--- a/packages/server/modules/workspaces/tests/integration/sso.graph.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/sso.graph.spec.ts
@@ -117,7 +117,7 @@ describe('Workspace SSO', () => {
   })
 
   afterEach(async () => {
-    truncateTables(['user_sso_sessions'])
+    await truncateTables(['user_sso_sessions'])
   })
 
   describe('given a workspace with SSO configured', () => {
diff --git a/packages/server/modules/workspaces/tests/integration/sso.spec.ts b/packages/server/modules/workspaces/tests/integration/sso.spec.ts
index 8d77da647..99f6fe6d5 100644
--- a/packages/server/modules/workspaces/tests/integration/sso.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/sso.spec.ts
@@ -251,7 +251,7 @@ describe('Workspace SSO repositories', () => {
     })
 
     afterEach(async () => {
-      truncateTables(['user_sso_sessions'])
+      await truncateTables(['user_sso_sessions'])
     })
 
     it('returns an empty array if there are no sessions', async () => {