diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cc07639a29..fb7ab96bbf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -277,7 +277,7 @@ jobs:
         env:
           DOCKER_CLI_HINTS: false
       - name: Login to Docker Hub
-        if: ${{ github.ref == 'refs/heads/main' }}
+        if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
         uses: docker/login-action@v3
         with:
           username: hardcoreeng
diff --git a/server/account/src/index.ts b/server/account/src/index.ts
index 5162b8e48d..084084b9df 100644
--- a/server/account/src/index.ts
+++ b/server/account/src/index.ts
@@ -581,7 +581,7 @@ export async function listWorkspaces (db: Db, productId: string): Promise<Client
   return (await db.collection<Workspace>(WORKSPACE_COLLECTION).find(withProductId(productId, {})).toArray())
     .map((it) => ({ ...it, productId }))
     .filter((it) => it.disabled !== true)
-    .map(mapToClientWorkspace)
+    .map(trimWorkspaceInfo)
 }
 
 /**
@@ -875,11 +875,21 @@ export async function getInviteLink (
  */
 export type ClientWorkspaceInfo = Omit<Workspace, '_id' | 'accounts' | 'workspaceUrl'>
 
+/**
+ * @public
+ */
+export type WorkspaceInfo = Omit<Workspace, '_id' | 'accounts' | 'workspaceUrl'>
+
 function mapToClientWorkspace (ws: Workspace): ClientWorkspaceInfo {
   const { _id, accounts, ...data } = ws
   return { ...data, workspace: ws.workspaceUrl ?? ws.workspace }
 }
 
+function trimWorkspaceInfo (ws: Workspace): WorkspaceInfo {
+  const { _id, accounts, ...data } = ws
+  return { ...data }
+}
+
 /**
  * @public
  */