diff --git a/extensions/agent/src/dialogs/alertDialog.ts b/extensions/agent/src/dialogs/alertDialog.ts
index 50e5bae810..1e7bfe8b5e 100644
--- a/extensions/agent/src/dialogs/alertDialog.ts
+++ b/extensions/agent/src/dialogs/alertDialog.ts
@@ -367,11 +367,18 @@ export class AlertDialog extends AgentDialog<AlertData> {
 					title: AlertDialog.NewJobButtonLabel
 				}], { componentWidth: '100%'}).component();
 
+			let previewTag = view.modelBuilder.text()
+				.withProperties({
+					value: 'Feature Preview'
+				}).component();
+
 			this.notifyOperatorsCheckBox = view.modelBuilder.checkBox()
 				.withProperties({
 					label: AlertDialog.NotifyOperatorsTextBoxLabel
 				}).component();
 
+			this.notifyOperatorsCheckBox.enabled = false;
+
 			this.operatorsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
@@ -423,6 +430,9 @@ export class AlertDialog extends AgentDialog<AlertData> {
 				}, {
 					component: executeJobContainer,
 					title: ''
+				}, {
+					component: previewTag,
+					title: ''
 				}, {
 					component: this.notifyOperatorsCheckBox,
 					title: ''
diff --git a/extensions/agent/src/dialogs/jobDialog.ts b/extensions/agent/src/dialogs/jobDialog.ts
index fb0e0657cf..926642ca15 100644
--- a/extensions/agent/src/dialogs/jobDialog.ts
+++ b/extensions/agent/src/dialogs/jobDialog.ts
@@ -125,7 +125,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 		this.initializeSchedulesTab();
 		this.initializeNotificationsTab();
 		this.dialog.content = [this.generalTab, this.stepsTab, this.schedulesTab, this.alertsTab, this.notificationsTab];
-
 		this.dialog.registerCloseValidator(() => {
 			this.updateModel();
 			let validationResult = this.model.validate();
@@ -194,6 +193,10 @@ export class JobDialog extends AgentDialog<JobData>  {
 
 	private initializeStepsTab() {
 		this.stepsTab.registerContent(async view => {
+			let previewTag = view.modelBuilder.text()
+				.withProperties({
+					value: 'Feature Preview'
+				}).component();
 			this.stepsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
@@ -246,8 +249,14 @@ export class JobDialog extends AgentDialog<JobData>  {
 				width: 80
 			}).component();
 
+			this.stepsTable.enabled = false;
+
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
+					component: previewTag,
+					title: ''
+				},
+				{
 					component: this.stepsTable,
 					title: this.JobStepsTopLabelString,
 					actions: [this.moveStepUpButton, this.moveStepDownButton, this.newStepButton, this.editStepButton, this.deleteStepButton]
@@ -258,6 +267,10 @@ export class JobDialog extends AgentDialog<JobData>  {
 
 	private initializeAlertsTab() {
 		this.alertsTab.registerContent(async view => {
+			let previewTag = view.modelBuilder.text()
+			.withProperties({
+				value: 'Feature Preview'
+			}).component();
 			this.alertsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
@@ -282,6 +295,9 @@ export class JobDialog extends AgentDialog<JobData>  {
 
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
+					component: previewTag,
+					title: ''
+				}, {
 					component: this.alertsTable,
 					title: this.AlertsTopLabelString,
 					actions: [this.newAlertButton]
diff --git a/extensions/agent/src/dialogs/operatorDialog.ts b/extensions/agent/src/dialogs/operatorDialog.ts
index 7eb8a356cd..edda143b63 100644
--- a/extensions/agent/src/dialogs/operatorDialog.ts
+++ b/extensions/agent/src/dialogs/operatorDialog.ts
@@ -368,6 +368,10 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
 	private initializeNotificationTab() {
 		this.notificationsTab.registerContent(async view => {
 
+			let previewTag = view.modelBuilder.text()
+				.withProperties({
+					value: 'Feature Preview'
+				}).component();
 			this.alertsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
@@ -381,6 +385,9 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
 
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
+					component: previewTag,
+					title: ''
+				}, {
 					component: this.alertsTable,
 					title: OperatorDialog.AlertsTableLabel
 				}]).withLayout({ width: '100%' }).component();