diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/scripts-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/scripts-workspace.context.ts
index 13fcc1d344..224ad7d7e7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/scripts-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/scripts-workspace.context.ts
@@ -1,6 +1,6 @@
 import { ScriptDetails, SCRIPTS_WORKSPACE_ALIAS } from '../config.js';
 import { UmbScriptsRepository } from '../repository/scripts.repository.js';
-import { createObservablePart, UmbBooleanState, UmbDeepState } from '@umbraco-cms/backoffice/observable-api';
+import { UmbBooleanState, UmbDeepState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
 import { loadCodeEditor } from '@umbraco-cms/backoffice/code-editor';
@@ -9,9 +9,9 @@ import { TextFileResponseModelBaseModel, UpdateScriptRequestModel } from '@umbra
 export class UmbScriptsWorkspaceContext extends UmbWorkspaceContext<UmbScriptsRepository, ScriptDetails> {
 	#data = new UmbDeepState<ScriptDetails | undefined>(undefined);
 	data = this.#data.asObservable();
-	name = createObservablePart(this.#data, (data) => data?.name);
-	content = createObservablePart(this.#data, (data) => data?.content);
-	path = createObservablePart(this.#data, (data) => data?.path);
+	name = this.#data.asObservablePart((data) => data?.name);
+	content = this.#data.asObservablePart((data) => data?.content);
+	path = this.#data.asObservablePart((data) => data?.path);
 
 	#isCodeEditorReady = new UmbBooleanState(false);
 	isCodeEditorReady = this.#isCodeEditorReady.asObservable();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts
index 5e46f6553c..40c182d16e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts
@@ -5,8 +5,7 @@ import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api
 import {
 	UmbArrayState,
 	UmbBooleanState,
-	UmbObjectState,
-	createObservablePart,
+	UmbObjectState
 } from '@umbraco-cms/backoffice/observable-api';
 import { loadCodeEditor } from '@umbraco-cms/backoffice/code-editor';
 import { RichTextRuleModel, UpdateStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api';
@@ -22,9 +21,9 @@ export class UmbStylesheetWorkspaceContext
 	#rules = new UmbArrayState<RichTextRuleModelSortable>([], (rule) => rule.name);
 	data = this.#data.asObservable();
 	rules = this.#rules.asObservable();
-	name = createObservablePart(this.#data, (data) => data?.name);
-	content = createObservablePart(this.#data, (data) => data?.content);
-	path = createObservablePart(this.#data, (data) => data?.path);
+	name = this.#data.asObservablePart((data) => data?.name);
+	content = this.#data.asObservablePart((data) => data?.content);
+	path = this.#data.asObservablePart((data) => data?.path);
 
 	#isCodeEditorReady = new UmbBooleanState(false);
 	isCodeEditorReady = this.#isCodeEditorReady.asObservable();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
index 3513ae3800..7221018fe3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -16,11 +16,11 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext<UmbTemplate
 	data = this.#data.asObservable();
 	#masterTemplate = new UmbObjectState<TemplateItemResponseModel | null>(null);
 	masterTemplate = this.#masterTemplate.asObservable();
-	name = createObservablePart(this.#data, (data) => data?.name);
-	alias = createObservablePart(this.#data, (data) => data?.alias);
-	content = createObservablePart(this.#data, (data) => data?.content);
-	id = createObservablePart(this.#data, (data) => data?.id);
-	masterTemplateID = createObservablePart(this.#data, (data) => data?.masterTemplateId);
+	name = this.#data.asObservablePart((data) => data?.name);
+	alias = this.#data.asObservablePart((data) => data?.alias);
+	content = this.#data.asObservablePart((data) => data?.content);
+	id = this.#data.asObservablePart((data) => data?.id);
+	masterTemplateID = this.#data.asObservablePart((data) => data?.masterTemplateId);
 
 	#isCodeEditorReady = new UmbBooleanState(false);
 	isCodeEditorReady = this.#isCodeEditorReady.asObservable();