diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
index 98d7533798..76ebfe3e07 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
@@ -23,6 +23,7 @@ import { APIResource } from '../../../../../../store/src/types/api.types';
 import {
   AppServiceBindingListConfigService,
 } from '../../../../shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service';
+import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service';
 import { ApplicationService } from '../../application.service';
 
 @Injectable()
@@ -49,9 +50,10 @@ export class AppDeleteServiceInstancesListConfigService extends AppServiceBindin
     appService: ApplicationService,
     datePipe: DatePipe,
     currentUserPermissionService: CurrentUserPermissionsService,
-    private paginationMonitorFactory: PaginationMonitorFactory
+    private paginationMonitorFactory: PaginationMonitorFactory,
+    serviceActionHelperService: ServiceActionHelperService
   ) {
-    super(store, appService, datePipe, currentUserPermissionService);
+    super(store, appService, datePipe, currentUserPermissionService, serviceActionHelperService);
 
     this.getGlobalActions = () => null;
     this.getMultiActions = () => null;
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
index 79b2d83b41..4864ddf0ae 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
@@ -7,6 +7,7 @@ import { generateTestApplicationServiceProvider } from '../../../../../../core/t
 import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../cf-entity-types';
+import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service';
 import {
   ApplicationEnvVarsHelper,
 } from '../../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -29,7 +30,8 @@ describe('DeleteAppInstancesComponent', () => {
         ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
-        DatePipe
+        DatePipe,
+        ServiceActionHelperService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
index 9bf67767d6..9881fe291a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
@@ -9,9 +9,8 @@ import { PaginationMonitorFactory } from '../../../../../../../../core/src/share
 import {
   generateTestApplicationServiceProvider,
 } from '../../../../../../../../core/test-framework/application-service-helper';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ServiceActionHelperService } from '../../../../../../shared/data-services/service-action-helper.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { ServicesTabComponent } from './services-tab.component';
 
@@ -29,7 +28,8 @@ describe('ServicesTabComponent', () => {
         ApplicationEnvVarsHelper,
         ApplicationStateService,
         PaginationMonitorFactory,
-        DatePipe
+        DatePipe,
+        ServiceActionHelperService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
index d6dbedbbf5..c1db16d5cf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
@@ -4,6 +4,11 @@
     matTooltip="Edit Organization">
     <mat-icon>mode_edit</mat-icon>
   </button>
+  <button mat-icon-button name="delete"
+    *appUserPermission="permsOrgDelete;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;"
+    (click)="deleteOrgWarn()" matTooltip="Delete Organization">
+    <mat-icon>delete</mat-icon>
+  </button>
   <button mat-icon-button name="cli"
     routerLink="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/cli"
     matTooltip="CLI Info">
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
index 7c2b5a335b..5242c102f4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
@@ -1,10 +1,18 @@
 import { Component } from '@angular/core';
+import { MatSnackBar } from '@angular/material';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
-import { filter, map, startWith } from 'rxjs/operators';
+import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
+import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
+import { selectDeletionInfo } from '../../../../../../../store/src/selectors/api.selectors';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { organizationEntityType } from '../../../../../cf-entity-types';
 import { goToAppWall } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
@@ -19,11 +27,14 @@ export class CloudFoundryOrganizationSummaryComponent {
   appLink: () => void;
   detailsLoading$: Observable<boolean>;
   public permsOrgEdit = CurrentUserPermissions.ORGANIZATION_EDIT;
+  public permsOrgDelete = CurrentUserPermissions.ORGANIZATION_DELETE;
 
   constructor(
-    store: Store<CFAppState>,
+    private store: Store<CFAppState>,
     public cfEndpointService: CloudFoundryEndpointService,
-    public cfOrgService: CloudFoundryOrganizationService
+    public cfOrgService: CloudFoundryOrganizationService,
+    private confirmDialog: ConfirmationDialogService,
+    private snackBar: MatSnackBar
   ) {
     this.appLink = () => {
       goToAppWall(store, cfOrgService.cfGuid, cfOrgService.orgGuid);
@@ -38,6 +49,46 @@ export class CloudFoundryOrganizationSummaryComponent {
       map(() => false),
       startWith(true)
     );
+  }
+
+  deleteOrgWarn() {
+    this.cfOrgService.org$.pipe(
+      map(org => org.entity.entity.name),
+      first()
+    ).subscribe(name => {
+      const confirmation = new ConfirmationDialogConfig(
+        'Delete Organization',
+        {
+          textToMatch: name
+        },
+        'Delete',
+        true,
+      );
+      this.confirmDialog.open(confirmation, () => {
+        this.cfEndpointService.deleteOrg(
+          this.cfOrgService.orgGuid,
+          this.cfEndpointService.cfGuid
+        );
 
+        const orgEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
+        this.store.select(selectDeletionInfo(orgEntity.entityKey, this.cfOrgService.orgGuid)).pipe(
+          pairwise(),
+          filter(([oldV, newV]) => (oldV.busy && !newV.busy) || newV.error),
+          tap(([, newV]) => {
+            if (newV.deleted) {
+              this.store.dispatch(new RouterNav({
+                path: [
+                  'cloud-foundry',
+                  this.cfOrgService.cfGuid,
+                  'organizations'
+                ]
+              }));
+            } else if (newV.error) {
+              this.snackBar.open(`Failed to delete space: ${newV.message}`, 'Close');
+            }
+          })
+        ).subscribe();
+      });
+    });
   }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index 5ca62dd6cd..ad5ce31697 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -101,7 +101,8 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
           )))
       }];
   }
-  ngOnInit(): void {
+
+  ngOnInit() {
     this.entityConfig = new ComponentEntityMonitorConfig(this.row.metadata.guid, cfEntityFactory(serviceBindingEntityType));
 
     this.isUserProvidedServiceInstance = !!isUserProvidedServiceInstance(this.row.entity.service_instance.entity);
@@ -125,8 +126,8 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
   }
 
   private setupAsServiceInstance() {
-    const serviceIntanceEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceIntanceEntity.actionOrchestrator.getActionBuilder('get');
+    const serviceInstanceEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
+    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('get');
     const getServiceInstanceAction = actionBuilder(this.row.entity.service_instance_guid, this.appService.cfGuid);
     const serviceInstance$ = this.entityServiceFactory.create<APIResource<IServiceInstance>>(
       this.row.entity.service_instance_guid,
@@ -237,7 +238,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     });
   }
 
-  detach = () => {
+  private detach = () => {
     this.serviceActionHelperService.detachServiceBinding(
       [this.row],
       this.row.entity.service_instance_guid,
@@ -247,7 +248,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     );
   }
 
-  edit = () => this.serviceActionHelperService.editServiceBinding(
+  private edit = () => this.serviceActionHelperService.editServiceBinding(
     this.row.entity.service_instance_guid,
     this.appService.cfGuid,
     { appId: this.appService.appGuid },
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
index a43d83f039..e9b6d2de3a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
@@ -6,6 +6,7 @@ import { generateCfBaseTestModules } from '../../../../../../test-framework/clou
 import {
   ApplicationEnvVarsHelper,
 } from '../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { AppServiceBindingListConfigService } from './app-service-binding-list-config.service';
 
 describe('AppServiceBindingListConfigService', () => {
@@ -15,7 +16,8 @@ describe('AppServiceBindingListConfigService', () => {
         AppServiceBindingListConfigService,
         generateTestApplicationServiceProvider('1', '1'),
         ApplicationEnvVarsHelper,
-        DatePipe
+        DatePipe,
+        ServiceActionHelperService
       ],
       imports: generateCfBaseTestModules()
     });
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
index 8d46228ea6..f2c2ce8b44 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
@@ -11,12 +11,18 @@ import {
   DataFunctionDefinition,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
-import { IGlobalListAction, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import {
+  IGlobalListAction,
+  IListAction,
+  ListViewTypes,
+} from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { GetAppServiceBindings } from '../../../../../actions/application-service-routes.actions';
 import { ApplicationService } from '../../../../../features/applications/application.service';
-import { isServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
+import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
+import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import {
   TableCellServiceInstanceTagsComponent,
@@ -47,7 +53,51 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     )
   };
 
-  getColumns = (): Array<ITableColumn<APIResource<IServiceBinding>>> => {
+  private listActionEdit: IListAction<APIResource<IServiceBinding>> = {
+    action: (item) => {
+      this.serviceActionHelperService.editServiceBinding(
+        item.entity.service_instance_guid,
+        this.appService.cfGuid,
+        { appId: this.appService.appGuid },
+        !!isUserProvidedServiceInstance(item.entity.service_instance.entity)
+      ).subscribe(res => {
+        if (!res.error) {
+          this.store.dispatch(new GetAppServiceBindings(this.appService.appGuid, this.appService.cfGuid));
+        }
+      });
+    },
+    label: 'Edit',
+    createVisible: () => this.appService.waitForAppEntity$.pipe(
+      switchMap(app => this.currentUserPermissionsService.can(
+        CurrentUserPermissions.SERVICE_BINDING_EDIT,
+        this.appService.cfGuid,
+        app.entity.entity.space_guid
+      ))
+    )
+  };
+
+  private listActionUnbind: IListAction<APIResource<IServiceBinding>> = {
+    action: (item) => {
+      this.serviceActionHelperService.detachServiceBinding(
+        [item],
+        item.entity.service_instance_guid,
+        this.appService.cfGuid,
+        false,
+        !!isUserProvidedServiceInstance(item.entity.service_instance.entity)
+      );
+
+    },
+    label: 'Unbind',
+    createVisible: () => this.appService.waitForAppEntity$.pipe(
+      switchMap(app => this.currentUserPermissionsService.can(
+        CurrentUserPermissions.SERVICE_BINDING_EDIT,
+        this.appService.cfGuid,
+        app.entity.entity.space_guid
+      ))
+    )
+  };
+
+  getColumns = (): ITableColumn<APIResource<IServiceBinding>>[] => {
     return [
       {
         columnId: 'name',
@@ -106,6 +156,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     private appService: ApplicationService,
     private datePipe: DatePipe,
     protected currentUserPermissionsService: CurrentUserPermissionsService,
+    private serviceActionHelperService: ServiceActionHelperService
   ) {
     super();
     this.dataSource = new AppServiceBindingDataSource(this.store, appService, this);
@@ -113,7 +164,10 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
 
   getGlobalActions = () => [this.listActionAdd];
   getMultiActions = () => [];
-  getSingleActions = () => [];
+  getSingleActions = () => [
+    this.listActionEdit,
+    this.listActionUnbind,
+  ]
   getMultiFiltersConfigs = () => [];
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
index 1c74b622e5..f78c26f832 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
@@ -1,20 +1,32 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { filter, first, map, pairwise } from 'rxjs/operators';
 
 import { CF_ENDPOINT_TYPE } from '../../../../cloud-foundry/cf-types';
-import { DeleteUserProvidedInstance } from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
+import {
+  DeleteUserProvidedInstance,
+  UpdateUserProvidedServiceInstance,
+} from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { serviceBindingEntityType, serviceInstancesEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IServiceBinding } from '../../../../core/src/core/cf-api-svc.types';
+import {
+  serviceBindingEntityType,
+  serviceInstancesEntityType,
+  userProvidedServiceInstanceEntityType,
+} from '../../../../cloud-foundry/src/cf-entity-types';
+import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../../../core/src/core/cf-api-svc.types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import {
   EntityCatalogueEntityConfig,
   IEntityMetadata,
 } from '../../../../core/src/core/entity-catalogue/entity-catalogue.types';
+import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
 import { RouterNav, RouterQueryParams } from '../../../../store/src/actions/router.actions';
-import { APIResource } from '../../../../store/src/types/api.types';
+import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
+import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
+import { UpdateServiceInstance } from '../../actions/service-instances.actions';
 import { ServiceBindingActionBuilders } from '../../entity-action-builders/service-binding.action-builders';
 import { ServiceInstanceActionBuilders } from '../../entity-action-builders/service-instance.action.builders';
 import {
@@ -38,6 +50,7 @@ export class ServiceActionHelperService {
   constructor(
     private confirmDialog: ConfirmationDialogService,
     private store: Store<CFAppState>,
+    private entityServiceFactory: EntityServiceFactory
   ) { }
 
   detachServiceBinding = (
@@ -99,16 +112,60 @@ export class ServiceActionHelperService {
   }
 
 
-  editServiceBinding = (guid: string, endpointGuid: string, query: RouterQueryParams = {}, userProvided = false) =>
+  editServiceBinding = (
+    guid: string,
+    endpointGuid: string,
+    query: RouterQueryParams = {},
+    userProvided = false): Observable<ActionState> => {
     this.store.dispatch(new RouterNav(
       {
         path: [
           '/services/', this.getRouteKey(userProvided), endpointGuid, guid, 'edit'
         ], query
       }
-    ))
+    ));
+
+    const obs: Observable<EntityInfo<APIResource>> = userProvided ?
+      this.createUserProvidedServiceInstanceObs(guid, endpointGuid) :
+      this.createServiceInstanceObs(guid, endpointGuid);
+
+    const updatingKey = userProvided ?
+      UpdateUserProvidedServiceInstance.updateServiceInstance :
+      UpdateServiceInstance.updateServiceInstance;
+
+    return obs.pipe(
+      filter(res => !!res),
+      map(res => res.entityRequestInfo.updating[updatingKey]),
+      filter(res => !!res),
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      first()
+    );
+  }
 
   private getRouteKey(userProvided: boolean) {
     return userProvided ? SERVICE_INSTANCE_TYPES.USER_SERVICE : SERVICE_INSTANCE_TYPES.SERVICE;
   }
+
+  private createUserProvidedServiceInstanceObs(guid: string, endpointGuid: string):
+    Observable<EntityInfo<APIResource<IUserProvidedServiceInstance>>> {
+    const serviceEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, userProvidedServiceInstanceEntityType);
+    const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('get');
+    const getUserProvidedServiceAction = actionBuilder(guid, endpointGuid);
+    return this.entityServiceFactory.create<APIResource<IUserProvidedServiceInstance>>(
+      guid,
+      getUserProvidedServiceAction
+    ).entityObs$;
+  }
+
+  private createServiceInstanceObs(guid: string, endpointGuid: string): Observable<EntityInfo<APIResource<IServiceInstance>>> {
+    const serviceInstanceEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
+    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('get');
+    const getServiceInstanceAction = actionBuilder(guid, endpointGuid);
+    return this.entityServiceFactory.create<APIResource<IServiceInstance>>(
+      guid,
+      getServiceInstanceAction
+    ).entityObs$;
+  }
 }
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
index 2c5f3e6134..0cb5e331c9 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { GeneralAppState } from '../../../../../store/src/app-state';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { ApiEntityType } from '../../api-drive-views.types';
-import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
-import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { map } from 'rxjs/operators';
-import { Router, ActivatedRoute } from '@angular/router';
+
+import { GeneralAppState } from '../../../../../store/src/app-state';
+import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
+import { ApiEntityType } from '../../api-drive-views.types';
 
 @Component({
   selector: 'app-api-endpoint-type-select-page',
@@ -21,7 +22,6 @@ export class ApiEndpointTypeSelectPageComponent implements OnInit {
     public activeRoute: ActivatedRoute
   ) { }
   public endpointSelected(endpoint: ApiEntityType) {
-    console.log(endpoint);
     this.router.navigate([endpoint.type], { relativeTo: this.activeRoute });
   }
   ngOnInit() {
diff --git a/src/frontend/packages/store/src/helpers/reducer.helper.ts b/src/frontend/packages/store/src/helpers/reducer.helper.ts
index 2a054ce483..077c8d4464 100644
--- a/src/frontend/packages/store/src/helpers/reducer.helper.ts
+++ b/src/frontend/packages/store/src/helpers/reducer.helper.ts
@@ -1,3 +1,5 @@
+import { stratosEndpointGuidKey } from '../entity-request-pipeline/pipeline.types';
+
 export const mergeState = (state, newState) => {
   const baseState = { ...state };
 
@@ -39,7 +41,7 @@ export const deepMergeState = (state, newState) => {
 
 export function mergeEntity(baseEntity, newEntity) {
   if (baseEntity && baseEntity.entity) {
-    return {
+    const merged = {
       entity: merge(baseEntity.entity, newEntity.entity),
       // Always apply the metadata regardless of whether it exists in the baseEntity or not
       // (for cases where we fetch missing inline data of an entity before the entity exists, for example fetch orgs and their spaces..
@@ -47,6 +49,10 @@ export function mergeEntity(baseEntity, newEntity) {
       // main org and mark it as fetched)
       metadata: baseEntity.metadata ? merge(baseEntity.metadata, newEntity.metadata) : newEntity.metadata
     };
+    if (baseEntity[stratosEndpointGuidKey]) {
+      merged[stratosEndpointGuidKey] = baseEntity[stratosEndpointGuidKey];
+    }
+    return merged;
   } else {
     return merge(baseEntity, newEntity);
   }