diff --git a/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss b/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss
index b8b8fce02..2fa2174b1 100644
--- a/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss
+++ b/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss
@@ -44,6 +44,10 @@
   }
 }
 
+.buttonIcon {
+  margin-right: var(--spacing-medium);
+}
+
 .popover {
   > div[class*='popover-arrow'] {
     display: none;
diff --git a/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss.d.ts b/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss.d.ts
index 1bce75c05..c182fd649 100644
--- a/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss.d.ts
+++ b/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.module.scss.d.ts
@@ -17,6 +17,7 @@
 /* eslint-disable */
 // This is an auto-generated file
 export declare const button: string
+export declare const buttonIcon: string
 export declare const listContainer: string
 export declare const main: string
 export declare const popover: string
diff --git a/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.tsx b/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.tsx
index 099d3c1b5..41af6f0a5 100644
--- a/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.tsx
+++ b/web/src/cde-gitness/components/CDEIDESelect/CDEIDESelect.tsx
@@ -23,6 +23,7 @@ import vsCodeWebIcon from 'cde-gitness/assests/vsCodeWeb.svg?url'
 import vscodeIcon from 'cde-gitness/assests/VSCode.svg?url'
 import { useStrings } from 'framework/strings'
 import { CDECustomDropdown } from '../CDECustomDropdown/CDECustomDropdown'
+import css from './CDEIDESelect.module.scss'
 
 export const CDEIDESelect = ({
   onChange,
@@ -61,7 +62,7 @@ export const CDEIDESelect = ({
       }
       label={
         <Layout.Horizontal width="100%" flex={{ alignItems: 'center', justifyContent: 'space-between' }}>
-          <img height={16} width={16} src={img} />
+          <img height={16} width={16} src={img} className={css.buttonIcon} />
           <Text>{label}</Text>
         </Layout.Horizontal>
       }
diff --git a/web/src/cde-gitness/components/CDESSHSelect/CDESSHSelect.tsx b/web/src/cde-gitness/components/CDESSHSelect/CDESSHSelect.tsx
index 016ffe88a..0110328fe 100644
--- a/web/src/cde-gitness/components/CDESSHSelect/CDESSHSelect.tsx
+++ b/web/src/cde-gitness/components/CDESSHSelect/CDESSHSelect.tsx
@@ -216,9 +216,7 @@ export const CDESSHSelect = () => {
           </Layout.Vertical>
         </Layout.Horizontal>
       }
-      label={
-        <Text icon={loading ? 'loading' : undefined}>{values?.ssh_token_identifier || '-- Select SSH Key --'}</Text>
-      }
+      label={<Text icon={loading ? 'loading' : undefined}>{values?.ssh_token_identifier || 'Select SSH Key'}</Text>}
       formikName="ssh_token_identifier"
       menu={
         <Menu>
diff --git a/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx b/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx
index b398daa93..9845cbd0c 100644
--- a/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx
+++ b/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx
@@ -35,7 +35,7 @@ export const DetailsCard = ({
   loading?: boolean
 }) => {
   const { getString } = useStrings()
-  const { branch, state, name, code_repo_url, code_repo_type, instance, resource } = data || {}
+  const { branch, state, name, branch_url, code_repo_type, instance, resource } = data || {}
   const color = getStatusColor(state)
   const customProps =
     state === GitspaceStatus.STARTING
@@ -80,7 +80,7 @@ export const DetailsCard = ({
               margin={{ left: 'small' }}
               style={{ cursor: 'pointer' }}
               font={{ align: 'left', size: 'normal' }}
-              onClick={() => window.open(code_repo_url, '_blank')}>
+              onClick={() => window.open(branch_url, '_blank')}>
               {name}
             </Text>
           </Layout.Horizontal>
@@ -93,7 +93,7 @@ export const DetailsCard = ({
             color={Color.PRIMARY_7}
             icon="git-branch"
             style={{ cursor: 'pointer' }}
-            onClick={() => window.open(code_repo_url, '_blank')}>
+            onClick={() => window.open(branch_url, '_blank')}>
             {branch}
           </Text>
         </Layout.Vertical>
diff --git a/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx b/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx
index 149352540..9942b8ff5 100644
--- a/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx
+++ b/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx
@@ -163,7 +163,7 @@ export const OwnerAndCreatedAt: Renderer<CellProps<TypesGitspaceConfig>> = ({ ro
 
 export const RenderRepository: Renderer<CellProps<TypesGitspaceConfig>> = ({ row }) => {
   const details = row.original
-  const { name, branch, code_repo_url, code_repo_type, instance } = details || {}
+  const { name, branch, branch_url, code_repo_type, instance } = details || {}
   const { has_git_changes } = instance || {}
 
   const { getString } = useStrings()
@@ -176,7 +176,7 @@ export const RenderRepository: Renderer<CellProps<TypesGitspaceConfig>> = ({ row
         onClick={e => {
           e.preventDefault()
           e.stopPropagation()
-          window.open(code_repo_url, '_blank')
+          window.open(branch_url, '_blank')
         }}>
         <Layout.Horizontal
           className={css.repositoryCell}
diff --git a/web/src/services/cde/index.tsx b/web/src/services/cde/index.tsx
index 0d0f3468b..00cb75ae5 100644
--- a/web/src/services/cde/index.tsx
+++ b/web/src/services/cde/index.tsx
@@ -48,6 +48,9 @@ export type EnumGitspaceEventType =
   | 'agent_gitspace_state_report_error'
   | 'agent_gitspace_state_report_stopped'
   | 'agent_gitspace_state_report_unknown'
+  | 'gitspace_action_auto_stop'
+
+export type EnumGitspaceFilterState = 'error' | 'running' | 'stopped'
 
 export type EnumGitspaceInstanceStateType =
   | 'running'
@@ -58,6 +61,10 @@ export type EnumGitspaceInstanceStateType =
   | 'starting'
   | 'stopping'
 
+export type EnumGitspaceOwner = 'all' | 'self'
+
+export type EnumGitspaceSort = 'created' | 'last_activated' | 'last_used'
+
 export type EnumGitspaceStateType = 'running' | 'stopped' | 'error' | 'uninitialized' | 'starting' | 'stopping'
 
 export type EnumIDEType = 'vs_code' | 'vs_code_web'
@@ -78,7 +85,6 @@ export interface InfraproviderResourceInput {
   name?: string
   network?: string | null
   region?: string[] | null
-  template_identifier?: string | null
 }
 
 export interface OpenapiCreateGitspaceRequest {
@@ -156,6 +162,7 @@ export interface TypesBranchResponse {
 
 export interface TypesGitspaceConfig {
   branch?: string
+  branch_url?: string
   code_repo_is_private?: boolean
   code_repo_ref?: string | null
   code_repo_type?: EnumGitspaceCodeRepoType
@@ -234,7 +241,6 @@ export interface TypesInfraProviderResource {
   network?: string | null
   region?: string
   space_path?: string
-  template_identifier?: string | null
   updated?: number
 }
 
@@ -357,6 +363,10 @@ export interface ListGitspacesQueryParams {
    * The maximum number of results to return.
    */
   limit?: number
+  gitspace_owner?: EnumGitspaceOwner
+  gitspace_states?: EnumGitspaceFilterState[]
+  sort?: EnumGitspaceSort
+  order?: 'asc' | 'desc'
 }
 
 export interface ListGitspacesPathParams {
diff --git a/web/src/services/cde/swagger.yaml b/web/src/services/cde/swagger.yaml
index afc22d105..ccd6740cf 100644
--- a/web/src/services/cde/swagger.yaml
+++ b/web/src/services/cde/swagger.yaml
@@ -89,6 +89,27 @@ paths:
             maximum: 100
             minimum: 1
             type: integer
+        - in: query
+          name: gitspace_owner
+          schema:
+            $ref: '#/components/schemas/EnumGitspaceOwner'
+        - in: query
+          name: gitspace_states
+          schema:
+            items:
+              $ref: '#/components/schemas/EnumGitspaceFilterState'
+            type: array
+        - in: query
+          name: sort
+          schema:
+            $ref: '#/components/schemas/EnumGitspaceSort'
+        - in: query
+          name: order
+          schema:
+            enum:
+              - asc
+              - desc
+            type: string
       responses:
         '200':
           content:
@@ -967,6 +988,13 @@ components:
         - agent_gitspace_state_report_error
         - agent_gitspace_state_report_stopped
         - agent_gitspace_state_report_unknown
+        - gitspace_action_auto_stop
+      type: string
+    EnumGitspaceFilterState:
+      enum:
+        - error
+        - running
+        - stopped
       type: string
     EnumGitspaceInstanceStateType:
       enum:
@@ -978,6 +1006,17 @@ components:
         - starting
         - stopping
       type: string
+    EnumGitspaceOwner:
+      enum:
+        - all
+        - self
+      type: string
+    EnumGitspaceSort:
+      enum:
+        - created
+        - last_activated
+        - last_used
+      type: string
     EnumGitspaceStateType:
       enum:
         - running
@@ -1034,9 +1073,6 @@ components:
             type: string
           nullable: true
           type: array
-        template_identifier:
-          nullable: true
-          type: string
       type: object
     OpenapiCreateGitspaceRequest:
       properties:
@@ -1162,6 +1198,8 @@ components:
       properties:
         branch:
           type: string
+        branch_url:
+          type: string
         code_repo_is_private:
           type: boolean
         code_repo_ref:
@@ -1324,9 +1362,6 @@ components:
           type: string
         space_path:
           type: string
-        template_identifier:
-          nullable: true
-          type: string
         updated:
           type: integer
       type: object