diff --git a/README.md b/README.md
index c9d2a463..d4744320 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,8 @@ sh ./scripts/test.sh --website='http://localhost:9090' -uicl
 This will run the OSS unit and integration tests, and the Cypress integration tests for a local Code Editor instance at `localhost:9090`. 
 
 ## Publishing Releases
-To publish a new release using the GitHub Action, push a tag that starts with `v`, e.g. `v1.5.0`. This will trigger an Action to create a tarball and publish it in a release with the tag `v1.5.0`. Currently the Action will require manual approval from @aws-pangestu, @aws-navinns, or @aws-asolidu.
+To publish a new release using the GitHub Action, open a new branch the open a PR, the PR should be reviewed and manually approval from @aws-pangestu, @aws-navinns, or @aws-asolidu.
+Once PR is approved, push a tag that starts with `v`, e.g. `v1.5.0`. This will trigger an Action to create a tarball and publish it in a release with the tag `v1.5.0`. Currently the Action will require. manually approval from @aws-pangestu, @aws-navinns, or @aws-asolidu.
 
 ### Future
 We hope to extend this Action to also automatically update the CodeEditor feedstock repository.
diff --git a/patches/base-path.diff b/patches/base-path.diff
index e729f907..29148ee0 100644
--- a/patches/base-path.diff
+++ b/patches/base-path.diff
@@ -38,19 +38,6 @@ Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench-dev.
  		Object.keys(self.webPackagePaths).map(function (key, index) {
  			self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
  		});
-Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.html
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench.html
-+++ sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.html
-@@ -36,7 +36,7 @@
- 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
- 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
- 	<script>
--		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
-+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
- 		Object.keys(self.webPackagePaths).map(function (key, index) {
- 			self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
- 		});
 Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.ts
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench.ts
@@ -146,19 +133,6 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
  				...this._productService.extensionsGallery,
-@@ -340,8 +345,10 @@ export class WebClientServer {
- 		const values: { [key: string]: string } = {
- 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
- 			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
--			WORKBENCH_WEB_BASE_URL: this._staticRoute,
--			WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
-+			WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
-+			WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
-+			BASE: base,
-+			VS_BASE: vscodeBase,
- 		};
- 
- 		if (useTestResolver) {
 @@ -443,3 +445,70 @@ export class WebClientServer {
  		return void res.end(data);
  	}
diff --git a/patches/disable-online-services.diff b/patches/disable-online-services.diff
index b8eba7aa..84b59f10 100644
--- a/patches/disable-online-services.diff
+++ b/patches/disable-online-services.diff
@@ -2,15 +2,6 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/platform/update/common/update.config.contribution.ts
 +++ sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.contribution.ts
-@@ -18,7 +18,7 @@ configurationRegistry.registerConfigurat
- 		'update.mode': {
- 			type: 'string',
- 			enum: ['none', 'manual', 'start', 'default'],
--			default: 'default',
-+			default: 'none',
- 			scope: ConfigurationScope.APPLICATION,
- 			description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
- 			tags: ['usesOnlineServices'],
 @@ -50,7 +50,7 @@ configurationRegistry.registerConfigurat
  		},
  		'update.showReleaseNotes': {
@@ -20,29 +11,3 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.
  			scope: ConfigurationScope.APPLICATION,
  			description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
  			tags: ['usesOnlineServices']
-Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
-+++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
-@@ -147,7 +147,7 @@ registry.registerConfiguration({
- 		'workbench.settings.enableNaturalLanguageSearch': {
- 			'type': 'boolean',
- 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
--			'default': true,
-+			'default': false,
- 			'scope': ConfigurationScope.WINDOW,
- 			'tags': ['usesOnlineServices']
- 		},
-Index: sagemaker-code-editor/vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
-+++ sagemaker-code-editor/vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
-@@ -146,7 +146,7 @@ registry.registerConfiguration({
- 		'workbench.enableExperiments': {
- 			'type': 'boolean',
- 			'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
--			'default': true,
-+			'default': false,
- 			'scope': ConfigurationScope.APPLICATION,
- 			'restricted': true,
- 			'tags': ['usesOnlineServices']
diff --git a/patches/disable-telemetry.diff b/patches/disable-telemetry.diff
index 725622d9..356819ad 100644
--- a/patches/disable-telemetry.diff
+++ b/patches/disable-telemetry.diff
@@ -1,54 +1,3 @@
 When pulling a new change from upstream, make sure to replace all .data.microsoft.com with 0.0.0.0
 Otherwise the OSS will still ping microsoft, even if the telemetry is set to OFF. 
 See: https://github.com/VSCodium/vscodium/issues/26
-
-Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetryService.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/platform/telemetry/common/telemetryService.ts
-+++ sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetryService.ts
-@@ -208,7 +208,7 @@ Registry.as<IConfigurationRegistry>(Exte
- 	'properties': {
- 		[TELEMETRY_SETTING_ID]: {
- 			'type': 'string',
--			'enum': [TelemetryConfiguration.ON, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
-+			'enum': [TelemetryConfiguration.OFF],
- 			'enumDescriptions': [
- 				localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
- 				localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
-@@ -216,7 +216,7 @@ Registry.as<IConfigurationRegistry>(Exte
- 				localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
- 			],
- 			'markdownDescription': getTelemetryLevelSettingDescription(),
--			'default': TelemetryConfiguration.ON,
-+			'default': TelemetryConfiguration.OFF,
- 			'restricted': true,
- 			'scope': ConfigurationScope.APPLICATION,
- 			'tags': ['usesOnlineServices', 'telemetry']
-Index: sagemaker-code-editor/vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-+++ sagemaker-code-editor/vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-@@ -288,7 +288,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL
- 			'telemetry.enableCrashReporter': {
- 				'type': 'boolean',
- 				'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
--				'default': true,
-+				'default': false,
- 				'tags': ['usesOnlineServices', 'telemetry'],
- 				'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
- 			}
-Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/1dsAppender.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/platform/telemetry/common/1dsAppender.ts
-+++ sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/1dsAppender.ts
-@@ -18,8 +18,8 @@ export interface IAppInsightsCore {
- 	unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
- }
- 
--const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0';
--const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
-+const endpointUrl = 'https://0.0.0.0/OneCollector/1.0';
-+const endpointHealthUrl = 'https://0.0.0.0/ping';
- 
- async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
- 	const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
diff --git a/patches/local-storage.diff b/patches/local-storage.diff
index 90c24abe..6534b785 100644
--- a/patches/local-storage.diff
+++ b/patches/local-storage.diff
@@ -16,23 +16,11 @@ To test install the Vim extension and make sure something that uses file storage
 works (history recall for example) and change settings from the UI and on disk
 while making sure they appear on the other side.
 
-Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/server/node/webClientServer.ts
-+++ sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
-@@ -332,6 +332,7 @@ export class WebClientServer {
- 		const workbenchWebConfiguration = {
- 			remoteAuthority,
- 			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
-+			userDataPath: this._environmentService.userDataPath,
- 			_wrapWebWorkerExtHostInIframe,
- 			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
- 			settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
 Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/web.api.ts
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/browser/web.api.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/browser/web.api.ts
-@@ -276,6 +276,11 @@ export interface IWorkbenchConstructionO
+@@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO
  	 */
  	readonly configurationDefaults?: Record<string, any>;
  
diff --git a/patches/sagemaker-extension.diff b/patches/sagemaker-extension.diff
index 998215f2..e69de29b 100644
--- a/patches/sagemaker-extension.diff
+++ b/patches/sagemaker-extension.diff
@@ -1,444 +0,0 @@
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/extension.ts
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/extension.ts
-@@ -0,0 +1,137 @@
-+import * as vscode from 'vscode';
-+import * as fs from 'fs';
-+import { SessionWarning } from "./sessionWarning";
-+import {
-+    FIFTEEN_MINUTES_INTERVAL_MILLIS,
-+    FIVE_MINUTES_INTERVAL_MILLIS,
-+    SAGEMAKER_METADATA_PATH,
-+    SIGN_IN_BUTTON,
-+    WARNING_BUTTON_REMIND_ME_IN_5_MINS,
-+    WARNING_BUTTON_SAVE,
-+    WARNING_BUTTON_SAVE_AND_RENEW_SESSION,
-+    SagemakerCookie,
-+    SagemakerResourceMetadata,
-+    getExpiryTime
-+} from "./constant";
-+import * as console from "console";
-+
-+
-+const PARSE_SAGEMAKER_COOKIE_COMMAND = 'sagemaker.parseCookies';
-+
-+function showWarningDialog() {
-+    vscode.commands.executeCommand(PARSE_SAGEMAKER_COOKIE_COMMAND).then(response => {
-+
-+        const sagemakerCookie: SagemakerCookie = response as SagemakerCookie
-+        const remainingTime: number = getExpiryTime(sagemakerCookie) - Date.now();
-+
-+        if(!(Object.keys(sagemakerCookie).length === 0)) {
-+            if (getExpiryTime(sagemakerCookie) != null && remainingTime > FIFTEEN_MINUTES_INTERVAL_MILLIS) {
-+                // This means cookie has been reset, reinitializing again
-+                initialize(sagemakerCookie);
-+            } else if (getExpiryTime(sagemakerCookie) != null && remainingTime > 0) {
-+                // READ COOKIE again to decide to show this up
-+
-+                SessionWarning.sessionExpiringWarning(remainingTime, sagemakerCookie)
-+                    .then((selection) => {
-+                        if (selection === WARNING_BUTTON_REMIND_ME_IN_5_MINS) {
-+                            // Trigger the function to show the warning again after 5 minutes.
-+                            setTimeout(showWarningDialog, FIVE_MINUTES_INTERVAL_MILLIS);
-+                        } else if (selection === WARNING_BUTTON_SAVE) {
-+                            saveWorkspace();
-+                        } else if (selection === WARNING_BUTTON_SAVE_AND_RENEW_SESSION) {
-+                            saveWorkspace();
-+                            // Trigger the function to make an API call to renew the session.
-+                            renewSession(sagemakerCookie);
-+                        }
-+                    });
-+
-+            } else {
-+                // this means expiryTime cookie is either invalid or <0
-+                signInError(sagemakerCookie);
-+            }
-+        } else {
-+            // no cookie found so assuming its running locally
-+        }
-+
-+    });
-+
-+}
-+
-+function signInError(sagemakerCookie: SagemakerCookie) {
-+    // The session has expired
-+    SessionWarning.signInWarning(sagemakerCookie)
-+        .then((selection) => {
-+            if (selection === SIGN_IN_BUTTON) {
-+                vscode.env.openExternal(vscode.Uri.parse(<string>sagemakerCookie.redirectURL));
-+            }
-+        });
-+}
-+
-+function initialize(sagemakerCookie: SagemakerCookie) {
-+    const currentTime = Date.now();
-+    const timeToExpiry = getExpiryTime(sagemakerCookie) - currentTime;
-+
-+    if (timeToExpiry <= 0) {
-+        signInError(sagemakerCookie);
-+    } else if (timeToExpiry >= FIFTEEN_MINUTES_INTERVAL_MILLIS) {
-+        const warningTime = timeToExpiry - FIFTEEN_MINUTES_INTERVAL_MILLIS;
-+        setTimeout(() => {
-+            showWarningDialog();
-+        }, warningTime);
-+    } else {
-+        // If less than or equal to 15 minutes left, set a timer for the remaining time
-+        const warningTime = timeToExpiry % FIVE_MINUTES_INTERVAL_MILLIS;
-+        setTimeout(() => {
-+            showWarningDialog();
-+        }, warningTime);
-+    }
-+}
-+
-+function saveWorkspace() {
-+    vscode.workspace.saveAll().then(() => {
-+        // TODO: log workspace saved
-+    });
-+}
-+function renewSession(sagemakerCookie: SagemakerCookie) {
-+    // TODO: Log and trigger a Signin
-+    vscode.env.openExternal(vscode.Uri.parse(<string>sagemakerCookie.redirectURL));
-+    // Trigger the function to show the warning again after 5 minutes again to validate.
-+    setTimeout(showWarningDialog, FIVE_MINUTES_INTERVAL_MILLIS);
-+}
-+
-+function updateStatusItemWithMetadata(context: vscode.ExtensionContext) {
-+    fs.readFile(SAGEMAKER_METADATA_PATH, 'utf-8', (err, data) => {
-+        if (err) {
-+            // fail silently not to block users
-+        } else {
-+            try {
-+                const jsonData = JSON.parse(data) as SagemakerResourceMetadata;
-+                const spaceName = jsonData.SpaceName;
-+
-+                if (spaceName != null) {
-+                    let spaceNameStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100);
-+                    spaceNameStatusBarItem.text = `Space: ${spaceName}`;
-+                    spaceNameStatusBarItem.show();
-+                    context.subscriptions.push(spaceNameStatusBarItem);
-+                }
-+            } catch (jsonError) {
-+                // fail silently not to block users
-+            }
-+        }
-+    });
-+}
-+
-+export function activate(context: vscode.ExtensionContext) {
-+
-+    // TODO: log activation of extension
-+    console.log('Activating Sagemaker Extension...');
-+
-+    // execute the get cookie command and save the data to cookies
-+    vscode.commands.executeCommand(PARSE_SAGEMAKER_COOKIE_COMMAND).then(r => {
-+
-+        const sagemakerCookie: SagemakerCookie = r as SagemakerCookie
-+
-+        initialize(sagemakerCookie);
-+        updateStatusItemWithMetadata(context);
-+    });
-+}
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/sessionWarning.ts
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/sessionWarning.ts
-@@ -0,0 +1,44 @@
-+import * as vscode from "vscode";
-+import {
-+    IAM_MESSAGE,
-+    isSSOMode, SagemakerCookie,
-+    SIGN_IN_BUTTON,
-+    SIGN_IN_HEADER,
-+    SIGN_IN_MESSAGE, SIGN_IN_MESSAGE_WHEN_REDIRECT_URL_DOES_NOT_EXIST, SSO_MESSAGE,
-+    WARNING_TIME_BUTTONS,
-+    WARNING_TIME_HEADER
-+} from "./constant";
-+
-+export class SessionWarning {
-+
-+    public static sessionExpiringWarning (warningTime: number, cookie: SagemakerCookie): Thenable<string | undefined> {
-+        // convert warningTime from ms to minutes;
-+        const warningTimeInMinutes: number = Math.floor(warningTime / 60000);
-+        const detail: string = `Your session will expire in ${warningTimeInMinutes} minutes. If your session expires, you could lose unsaved changes \n ${isSSOMode(cookie) ? SSO_MESSAGE : IAM_MESSAGE}`
-+        const sessionExpiringOptions: vscode.MessageOptions = {
-+            detail: detail,
-+            modal: true
-+        };
-+
-+        // Session expiration warning...
-+        if (isSSOMode(cookie)) {
-+            return vscode.window.showWarningMessage(WARNING_TIME_HEADER, sessionExpiringOptions, ...WARNING_TIME_BUTTONS.SSO);
-+        } else {
-+            return vscode.window.showWarningMessage(WARNING_TIME_HEADER, sessionExpiringOptions, ...WARNING_TIME_BUTTONS.IAM);
-+        }
-+    }
-+
-+    public static signInWarning (cookie: SagemakerCookie): Thenable<string | undefined> {
-+        const signInOptions: vscode.MessageOptions = {
-+            detail: cookie.redirectURL ? SIGN_IN_MESSAGE : SIGN_IN_MESSAGE_WHEN_REDIRECT_URL_DOES_NOT_EXIST,
-+            modal: true
-+        };
-+
-+		// SignIn warning...
-+        if (cookie.redirectURL) {
-+            return vscode.window.showErrorMessage(SIGN_IN_HEADER, signInOptions, SIGN_IN_BUTTON);
-+        } else {
-+            return vscode.window.showErrorMessage(SIGN_IN_HEADER, signInOptions);
-+        }
-+    }
-+}
-\ No newline at end of file
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/.vscodeignore
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/.vscodeignore
-@@ -0,0 +1,12 @@
-+.vscode/**
-+.vscode-test/**
-+out/test/**
-+out/**
-+test/**
-+src/**
-+tsconfig.json
-+out/test/**
-+out/**
-+cgmanifest.json
-+yarn.lock
-+preview-src/**
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/package.json
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/package.json
-@@ -0,0 +1,46 @@
-+{
-+  "name": "sagemaker-extension",
-+  "displayName": "Sagemaker Extension",
-+  "description": "Sagemaker Extension",
-+  "extensionKind": [
-+    "workspace"
-+  ],
-+  "version": "1.0.0",
-+  "publisher": "sagemaker",
-+  "license": "MIT",
-+  "engines": {
-+    "vscode": "^1.70.0"
-+  },
-+  "main": "./out/extension",
-+  "categories": [
-+    "Other"
-+  ],
-+  "activationEvents": [
-+    "*"
-+  ],
-+  "capabilities": {
-+    "virtualWorkspaces": true,
-+    "untrustedWorkspaces": {
-+      "supported": true
-+    }
-+  },
-+  "contributes": {
-+    "configuration": {
-+      "type": "object",
-+      "title": "Sagemaker Extension",
-+      "properties": {}
-+    },
-+    "commands": [
-+    ]
-+  },
-+  "scripts": {
-+    "compile": "gulp compile-extension:sagemaker-extension",
-+    "watch": "npm run build-preview && gulp watch-extension:sagemaker-extension",
-+    "vscode:prepublish": "npm run build-ext",
-+    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:sagemaker-extension ./tsconfig.json"
-+  },
-+  "dependencies": {
-+  },
-+  "repository": {
-+  }
-+}
-Index: sagemaker-code-editor/vscode/build/gulpfile.extensions.js
-===================================================================
---- sagemaker-code-editor.orig/vscode/build/gulpfile.extensions.js
-+++ sagemaker-code-editor/vscode/build/gulpfile.extensions.js
-@@ -63,6 +63,7 @@ const compilations = [
-	'extensions/references-view/tsconfig.json',
-	'extensions/search-result/tsconfig.json',
-	'extensions/simple-browser/tsconfig.json',
-+	'extensions/sagemaker-extension/tsconfig.json',
-	'extensions/tunnel-forwarding/tsconfig.json',
-	'extensions/typescript-language-features/test-workspace/tsconfig.json',
-	'extensions/typescript-language-features/web/tsconfig.json',
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/README.md
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/README.md
-@@ -0,0 +1,5 @@
-+# Sagemaker Extension
-+
-+The SageMaker Extension alerts users to sign in again before their session expires. It remains active continuously and cannot be disabled.
-+
-+Session Management: The extension monitors the SageMaker cookie to ensure seamless session continuity. It proactively alerts users to sign in again before the session expires, enhancing the user experience by preventing unexpected session interruptions.
-\ No newline at end of file
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/tsconfig.json
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/tsconfig.json
-@@ -0,0 +1,10 @@
-+{
-+	"extends": "../tsconfig.base.json",
-+	"compilerOptions": {
-+		"outDir": "./out"
-+	},
-+	"include": [
-+		"src/**/*",
-+		"../../src/vscode-dts/vscode.d.ts"
-+	]
-+}
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/yarn.lock
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/yarn.lock
-@@ -0,0 +1,4 @@
-+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-+# yarn lockfile v1
-+
-+
-Index: sagemaker-code-editor/vscode/build/npm/dirs.js
-===================================================================
---- sagemaker-code-editor.orig/vscode/build/npm/dirs.js
-+++ sagemaker-code-editor/vscode/build/npm/dirs.js
-@@ -39,6 +39,7 @@ const dirs = [
- 	'extensions/npm',
- 	'extensions/php-language-features',
- 	'extensions/references-view',
-+	'extensions/sagemaker-extension',
- 	'extensions/search-result',
- 	'extensions/simple-browser',
- 	'extensions/tunnel-forwarding',
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/extension-browser.webpack.config.js
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/extension-browser.webpack.config.js
-@@ -0,0 +1,17 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright Amazon.com Inc. or its affiliates. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+//@ts-check
-+
-+'use strict';
-+
-+const withBrowserDefaults = require('../shared.webpack.config').browser;
-+
-+module.exports = withBrowserDefaults({
-+    context: __dirname,
-+    entry: {
-+        extension: './src/extension.ts'
-+    },
-+});
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/extension.webpack.config.js
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/extension.webpack.config.js
-@@ -0,0 +1,20 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright Amazon.com Inc. or its affiliates. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+//@ts-check
-+
-+'use strict';
-+
-+const withDefaults = require('../shared.webpack.config');
-+
-+module.exports = withDefaults({
-+    context: __dirname,
-+    resolve: {
-+        mainFields: ['module', 'main']
-+    },
-+    entry: {
-+        extension: './src/extension.ts',
-+    }
-+});
-Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/constant.ts
-===================================================================
---- /dev/null
-+++ sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/constant.ts
-@@ -0,0 +1,72 @@
-+// Constants
-+export const WARNING_TIME_HEADER = 'Session expiring soon';
-+
-+export const WARNING_BUTTON_REMIND_ME_IN_5_MINS = 'Remind me in 5 minutes';
-+export const WARNING_BUTTON_SAVE = 'Save';
-+export const WARNING_BUTTON_SAVE_AND_RENEW_SESSION = 'Save and renew session';
-+export const WARNING_TIME_BUTTONS = {
-+	SSO: [WARNING_BUTTON_REMIND_ME_IN_5_MINS, WARNING_BUTTON_SAVE],
-+	IAM: [WARNING_BUTTON_REMIND_ME_IN_5_MINS, WARNING_BUTTON_SAVE_AND_RENEW_SESSION]
-+};
-+
-+// Constants for signInWarning
-+export const SIGN_IN_HEADER = 'Please sign in again';
-+export const SIGN_IN_MESSAGE = "You were logged out of your account. Choose 'Sign In' to continue using this workplace.";
-+export const SIGN_IN_MESSAGE_WHEN_REDIRECT_URL_DOES_NOT_EXIST = "You were logged out of your account. You are not able to\n" +
-+	"                  perform actions in your workplace at this time. Please start a\n" +
-+	"                  new session.";
-+export const SIGN_IN_BUTTON = 'Sign In';
-+export const SSO_MESSAGE = 'To renew the session, log out from Studio App via "File" -> "Log Out" and then "Sign out" from AWS IAM Identity Center (successor to AWS SSO) user portal. Do you want to save all changes now?';
-+export const IAM_MESSAGE = 'Do you want to renew your session now?'
-+export enum AUTH_MODE {
-+	SSO = "Sso",
-+	IAM = "Iam"
-+}
-+export const FIFTEEN_MINUTES_INTERVAL_MILLIS = 15 * 60 * 1000;
-+export const FIVE_MINUTES_INTERVAL_MILLIS = 5 * 60 * 1000;
-+
-+export const SAGEMAKER_METADATA_PATH = '/opt/ml/metadata/resource-metadata.json';
-+
-+export class SagemakerCookie {
-+	authMode: string
-+	expiryTime: number
-+	ssoExpiryTimestamp: number
-+	studioUserProfileName: string
-+	redirectURL: string
-+
-+	constructor(
-+		authMode: string,
-+		expiryTime: number,
-+		ssoExpiryTimestamp: number,
-+		studioUserProfileName: string,
-+		redirectURL: string
-+	) {
-+		this.authMode = authMode;
-+		this.expiryTime = expiryTime;
-+		this.ssoExpiryTimestamp = ssoExpiryTimestamp
-+		this.studioUserProfileName = studioUserProfileName
-+		this.redirectURL = redirectURL
-+	}
-+};
-+
-+export class SagemakerResourceMetadata {
-+	AppType?: string
-+	DomainId?: string
-+	SpaceName?: string
-+	ResourceArn?: string
-+	ResourceName?: string
-+	AppImageVersion?: string
-+};
-+export function isSSOMode(cookie: SagemakerCookie) {
-+	return (cookie.authMode === AUTH_MODE.SSO)
-+}
-+
-+export function getExpiryTime(cookie: SagemakerCookie): number {
-+	if (AUTH_MODE.SSO === cookie.authMode) {
-+		return cookie.ssoExpiryTimestamp;
-+	} else if (AUTH_MODE.IAM === cookie.authMode) {
-+		return cookie.expiryTime;
-+	} else {
-+		return -1;
-+	}
-+}
-\ No newline at end of file
diff --git a/patches/sagemaker-idle-extension.patch b/patches/sagemaker-idle-extension.patch
index f42b600d..9597edfc 100644
--- a/patches/sagemaker-idle-extension.patch
+++ b/patches/sagemaker-idle-extension.patch
@@ -269,10 +269,10 @@ Index: sagemaker-code-editor/vscode/build/gulpfile.extensions.js
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/build/gulpfile.extensions.js
 +++ sagemaker-code-editor/vscode/build/gulpfile.extensions.js
-@@ -61,6 +61,7 @@ const compilations = [
+@@ -59,6 +59,7 @@ const compilations = [
+ 	'extensions/references-view/tsconfig.json',
  	'extensions/search-result/tsconfig.json',
  	'extensions/simple-browser/tsconfig.json',
- 	'extensions/sagemaker-extension/tsconfig.json',
 +	'extensions/sagemaker-idle-extension/tsconfig.json',
  	'extensions/tunnel-forwarding/tsconfig.json',
  	'extensions/typescript-language-features/test-workspace/tsconfig.json',
@@ -281,10 +281,10 @@ Index: sagemaker-code-editor/vscode/build/npm/dirs.js
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/build/npm/dirs.js
 +++ sagemaker-code-editor/vscode/build/npm/dirs.js
-@@ -40,6 +40,7 @@ const dirs = [
+@@ -38,6 +38,7 @@ const dirs = [
+ 	'extensions/npm',
  	'extensions/php-language-features',
  	'extensions/references-view',
- 	'extensions/sagemaker-extension',
 +	'extensions/sagemaker-idle-extension',
  	'extensions/search-result',
  	'extensions/simple-browser',
@@ -296,12 +296,12 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
 @@ -4,6 +4,7 @@
   *--------------------------------------------------------------------------------------------*/
  
- import { createReadStream } from 'fs';
+ import { createReadStream, promises } from 'fs';
 +import {readFile } from 'fs/promises';
- import { Promises } from 'vs/base/node/pfs';
  import * as path from 'path';
  import * as http from 'http';
-@@ -100,6 +101,7 @@ export class WebClientServer {
+ import * as url from 'url';
+@@ -101,6 +102,7 @@ export class WebClientServer {
  	private readonly _staticRoute: string;
  	private readonly _callbackRoute: string;
  	private readonly _webExtensionRoute: string;
@@ -309,7 +309,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  
  	constructor(
  		private readonly _connectionToken: ServerConnectionToken,
-@@ -115,6 +117,7 @@ export class WebClientServer {
+@@ -117,6 +119,7 @@ export class WebClientServer {
  		this._staticRoute = `${serverRootPath}/static`;
  		this._callbackRoute = `${serverRootPath}/callback`;
  		this._webExtensionRoute = `${serverRootPath}/web-extension-resource`;
@@ -317,7 +317,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  	}
  
  	/**
-@@ -132,6 +135,9 @@ export class WebClientServer {
+@@ -134,6 +137,9 @@ export class WebClientServer {
  			if (pathname === this._basePath) {
  				return this._handleRoot(req, res, parsedUrl);
  			}
@@ -327,7 +327,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  			if (pathname === this._callbackRoute) {
  				// callback support
  				return this._handleCallback(res);
-@@ -451,6 +457,27 @@ export class WebClientServer {
+@@ -468,4 +474,25 @@ export class WebClientServer {
  		});
  		return void res.end(data);
  	}
@@ -353,5 +353,3 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
 +		}
 +	}
  }
- 
- /**
diff --git a/patches/sagemaker-integration.diff b/patches/sagemaker-integration.diff
index 9af2d5de..53357c96 100644
--- a/patches/sagemaker-integration.diff
+++ b/patches/sagemaker-integration.diff
@@ -69,7 +69,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/web.main.ts
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/browser/web.main.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/browser/web.main.ts
-@@ -95,6 +95,7 @@ import { TunnelSource } from 'vs/workbench/services/re
+@@ -96,6 +96,7 @@ import { ISecretStorageService } from 'v
  import { TunnelSource } from 'vs/workbench/services/remote/common/tunnelModel';
  import { mainWindow } from 'vs/base/browser/window';
  import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
@@ -77,16 +77,16 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/web.main.ts
  
  export class BrowserMain extends Disposable {
  
-@@ -129,6 +130,9 @@ export class BrowserMain extends Disposable {
- 
+@@ -131,6 +132,9 @@ export class BrowserMain extends Disposa
  		// Startup
  		const instantiationService = workbench.startup();
-+
+ 
 +		// Create instance of SagemakerServerClient
 +		this._register(instantiationService.createInstance(SagemakerServerClient));
- 
++
  		// Window
  		this._register(instantiationService.createInstance(BrowserWindow));
+ 
 Index: sagemaker-code-editor/vscode/product.json
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/product.json
@@ -100,14 +100,14 @@ Index: sagemaker-code-editor/vscode/product.json
  	"applicationName": "code-oss",
  	"dataFolderName": ".vscode-oss",
  	"win32MutexName": "vscodeoss",
-@@ -34,52 +34,16 @@
+@@ -32,53 +32,17 @@
  	"urlProtocol": "code-oss",
  	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
  	"builtInExtensions": [
 -		{
 -			"name": "ms-vscode.js-debug-companion",
--			"version": "1.1.2",
--			"sha256": "e034b8b41beb4e97e02c70f7175bd88abe66048374c2bd629f54bb33354bc2aa",
+-			"version": "1.1.3",
+-			"sha256": "7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93",
 -			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
 -			"metadata": {
 -				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
@@ -122,8 +122,8 @@ Index: sagemaker-code-editor/vscode/product.json
 -		},
 -		{
 -			"name": "ms-vscode.js-debug",
--			"version": "1.90.0",
--			"sha256": "1317dd7d1ac50641c1534a3e957ecbc94349f4fbd897acb916da11eea3208a66",
+-			"version": "1.93.0",
+-			"sha256": "9339cb8e6b77f554df54d79e71f533279cb76b0f9b04c207f633bfd507442b6a",
 -			"repo": "https://github.com/microsoft/vscode-js-debug",
 -			"metadata": {
 -				"id": "25629058-ddac-4e17-abba-74678e126c5d",
@@ -152,6 +152,7 @@ Index: sagemaker-code-editor/vscode/product.json
 -				"publisherDisplayName": "Microsoft"
 -			}
 -		}
+-	]
 +	],
 +	"extensionsGallery": {
 +		"serviceUrl": "https://open-vsx.org/vscode/gallery",
@@ -164,37 +165,13 @@ Index: sagemaker-code-editor/vscode/product.json
 +	},
 +	"linkProtectionTrustedDomains": [
 +		"https://open-vsx.org"
- 	]
-Index: sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/platform/product/common/product.ts
-+++ sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts
-@@ -59,15 +59,17 @@ else {
- 	if (Object.keys(product).length === 0) {
- 		Object.assign(product, {
- 			version: '1.90.0-dev',
--			nameShort: 'Code - OSS Dev',
--			nameLong: 'Code - OSS Dev',
-+			nameShort: 'CodeEditor',
-+			nameLong: 'Code Editor',
- 			applicationName: 'code-oss',
- 			dataFolderName: '.vscode-oss',
-+			commit: "hellocommit",
-+			date: "hellodate",
- 			urlProtocol: 'code-oss',
- 			reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
- 			licenseName: 'MIT',
- 			licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
--			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt'
-+			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
- 		});
- 	}
++ 	]
  }
 Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -779,8 +779,8 @@ export class GettingStartedPage extends EditorPane {
+@@ -800,8 +800,8 @@ export class GettingStartedPage extends
  		}));
  
  		const header = $('.header', {},
@@ -379,7 +356,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStart
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
-@@ -257,8 +257,8 @@ export const walkthroughs: GettingStartedWalkthroughCo
+@@ -310,8 +310,8 @@ export const walkthroughs: GettingStarte
  
  	{
  		id: 'SetupWeb',
diff --git a/patches/series b/patches/series
index 9091c133..1547c75c 100644
--- a/patches/series
+++ b/patches/series
@@ -7,4 +7,4 @@ local-storage.diff
 sagemaker-integration.diff
 license.diff
 sagemaker-idle-extension.patch
-terminal-crash-mitigation.patch
\ No newline at end of file
+terminal-crash-mitigation.patch
diff --git a/patches/webview.diff b/patches/webview.diff
index adb72d45..4edf4b38 100644
--- a/patches/webview.diff
+++ b/patches/webview.diff
@@ -69,15 +69,6 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
 +++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
-@@ -5,7 +5,7 @@
- 	<meta charset="UTF-8">
-
- 	<meta http-equiv="Content-Security-Policy"
--		content="default-src 'none'; script-src 'sha256-bQPwjO6bLiyf6v9eDVtAI67LrfonA1w49aFkRXBy4/g=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
-+		content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
-
- 	<!-- Disable pinch zooming -->
- 	<meta name="viewport"
 @@ -344,6 +344,12 @@
  
  				const hostname = location.hostname;
@@ -110,17 +101,8 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre
  					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
 Index: sagemaker-code-editor/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
 ===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/servicesx/extensions/worker/webWorkerExtensionHostIframe.html
 +++ sagemaker-code-editor/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
-@@ -4,7 +4,7 @@
- 		<meta http-equiv="Content-Security-Policy" content="
- 			default-src 'none';
- 			child-src 'self' data: blob:;
--			script-src 'self' 'unsafe-eval' 'sha256-75NYUUvf+5++1WbfCZOV3PSWxBhONpaxwx+mkOFRv/Y=' https:;
-+			script-src 'self' 'unsafe-eval' 'sha256-c7vPrYRaSLDtFSrI4CuHYgBQ3a4c4x2LSm/LefSZADQ=' https:;
- 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
- 	</head>
- 	<body>
 @@ -23,6 +23,13 @@
  			// validation not requested
  			return start();
diff --git a/vscode b/vscode
index 611f9bfc..4849ca9b 160000
--- a/vscode
+++ b/vscode
@@ -1 +1 @@
-Subproject commit 611f9bfce64f25108829dd295f54a6894e87339d
+Subproject commit 4849ca9bdf9666755eb463db297b69e5385090e3