diff --git a/.actrc b/.actrc
new file mode 100644
index 000000000..3da902c8e
--- /dev/null
+++ b/.actrc
@@ -0,0 +1,2 @@
+-P ubuntu-latest=node:22-bookworm
+--container-options=--memory=32g --network=host
\ No newline at end of file
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..82b5c4c93
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,17 @@
+# Exclude large directories that aren't needed for build
+vscode/node_modules
+
+# Exclude build artifacts
+*.tar.gz
+*.log
+
+# Exclude development files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# Exclude OS files
+.DS_Store
+Thumbs.db
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..8a68f4c2d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+vscode-reh-web-linux-x64/node filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7ecf8d2b..89c92bc5a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,6 +9,7 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  # The main job for building the application
   build:
     name: Build sagemaker-code-editor
     runs-on: ubuntu-latest
@@ -37,7 +38,13 @@ jobs:
       - name: Apply patches (if any)
         run: |
           if [ -d patches ] && [ "$(ls -A patches)" ]; then
-            quilt push -a || true
+            {
+              quilt push -a --leave-rejects --color=auto 
+            } || {
+              printf "\nPatching error, review logs!\n"
+              find ./vscode -name "*.rej"
+              exit 1
+            }
           fi
 
       - name: Set Development Version
@@ -53,18 +60,17 @@ jobs:
           cd vscode
           export DISABLE_V8_COMPILE_CACHE=1
           export UV_THREADPOOL_SIZE=4
+
+          npm install -g node-gyp
           
+          # Install dependencies using npm, skip optional and native modules
           npm install
           
-          VSCODE_RIPGREP_VERSION=$(jq -r '.dependencies."@vscode/ripgrep"' package.json)
-          mv package.json package.json.orig
-          jq 'del(.dependencies."@vscode/ripgrep")' package.json.orig > package.json
-          
-          npm install
-          npm install --ignore-scripts "@vscode/ripgrep@${VSCODE_RIPGREP_VERSION}"
-          
+          # Run the gulp build task with memory optimizations
           ARCH_ALIAS=linux-x64
-          npx gulp vscode-reh-web-${ARCH_ALIAS}-min
+          node --max-old-space-size=32768 --optimize-for-size \
+              ./node_modules/gulp/bin/gulp.js \
+              "vscode-reh-web-${ARCH_ALIAS}-min"
 
       - name: Find build output
         id: find_output
@@ -96,7 +102,8 @@ jobs:
           tar czf $TARBALL -C "$PARENT_DIR" "$BUILD_DIR_NAME"
       
       - name: Upload build artifact
+        if: env.ACT == ''
         uses: actions/upload-artifact@v4
         with:
           name: npm-package
-          path: sagemaker-code-editor-${{ env.VERSION }}.tar.gz
+          path: sagemaker-code-editor-${{ env.VERSION }}.tar.gz
\ No newline at end of file
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f0eeb7124..f90e622fa 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -16,23 +16,20 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.workflow_run.conclusion == 'success' || github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Checkout repo with submodules
+        uses: actions/checkout@v4
         with:
-          node-version: 20
-          cache: npm
-      - run: npm ci
-      - name: Download build artifact
-        if: github.event_name != 'pull_request'
-        uses: actions/download-artifact@v4
+          submodules: recursive
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
         with:
-          name: build-package
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
+          node-version: 20
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
       - name: Run E2E tests
         run: |
           # Add your actual E2E test commands here
-          echo "Running E2E tests..."
+          echo "[PLACEHOLDER] Running E2E tests..."
           # Example: npm run test:e2e
       - uses: actions/upload-artifact@v4
         if: failure()
diff --git a/.gitignore b/.gitignore
index eab08afe3..b5e3fb045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .DS_Store
-.pc
\ No newline at end of file
+.pc
+.artifacts
+bin
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c4b6a1c50..6ee63d7e8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,11 +30,15 @@ Contributions via pull requests are much appreciated. Before sending us a pull r
 To send us a pull request, please:
 
 1. Fork the repository.
-2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
-3. Ensure local tests pass.
-4. Commit to your fork using clear commit messages.
-5. Send us a pull request, answering any default questions in the pull request interface.
-6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
+2. Create a branch for your change.
+3. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
+4. Ensure local tests pass.
+5. Commit to your fork using clear commit messages.
+6. Push that branch to the upstream `aws/sagemaker-code-editor` repository.
+7. Send us a pull request (from your branch in  `aws/sagemaker-code-editor`), answering any default questions in the pull request interface.
+    
+    > ***Important***: Our tests will **always fail** if the pull request does not come from a branch in the  `aws/sagemaker-code-editor` repository. 
+8. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..1be0c16e0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,74 @@
+.PHONY: build-cache build install-act run-github run-local clean-vscode clean
+
+build-cache:
+	@echo "Building SageMaker Code Editor (multi-stage npm cache)..."
+	docker buildx build \
+		--platform linux/amd64 \
+		--progress=plain \
+		--memory=32g \
+		-t npm-cache:latest \
+		-f scripts/Dockerfile.build.cache .
+
+build:
+	@echo "Building SageMaker Code Editor (original)..."
+	docker buildx build \
+		--platform linux/amd64 \
+		--progress=plain \
+		--memory=32g \
+		--output type=local,dest=./.artifacts \
+		-t localbuild:latest \
+		-f scripts/Dockerfile.build .
+
+install-act:
+	@echo "Installing act (GitHub Actions runner)..."
+	@if ! command -v act >/dev/null 2>&1 && [ ! -f ./bin/act ]; then \
+		curl -s https://raw.githubusercontent.com/nektos/act/master/install.sh | bash; \
+		echo "act installed successfully"; \
+	else \
+		echo "act is already available"; \
+	fi
+
+run-github: install-act
+	@echo "Running complete GitHub Actions workflow locally..."
+	@echo "Available workflows:"
+	@ls -la .github/workflows/
+	@echo ""
+	@echo "Running full build.yml workflow..."
+	@if command -v act >/dev/null 2>&1; then \
+		act push -W .github/workflows/build.yml --platform ubuntu-22.04=catthehacker/ubuntu:act-22.04 --container-options "--memory=32g --memory-swap=32g"; \
+	else \
+		./bin/act push -W .github/workflows/build.yml --platform ubuntu-22.04=catthehacker/ubuntu:act-22.04 --container-options "--memory=32g --memory-swap=32g"; \
+	fi
+
+run-local:
+	@if [ -z "$(TARBALL)" ]; then \
+		echo "Building and running SageMaker Code Editor locally on port 8888..."; \
+		docker build -f scripts/Dockerfile.dev -t local-code-editor-dev . || exit 1; \
+		echo "Stopping container..."; \
+		docker stop local-code-editor-dev; \
+		sleep 2; \
+		echo "Starting container on http://localhost:8888"; \
+		docker run --rm -d -p 8888:8000 -v .:/workspace --entrypoint /workspace/scripts/run-code-editor-dev.sh --name local-code-editor-dev local-code-editor-dev || exit 1; \
+		docker logs -f local-code-editor-dev; \
+	else \
+		echo "Building and running SageMaker Code Editor locally on port 8888..."; \
+		docker build -f scripts/Dockerfile.run --build-arg TARBALL=$(TARBALL) -t local-code-editor . || exit 1; \
+		echo "Stopping container..."; \
+		docker stop local-code-editor; \
+		sleep 2; \
+		echo "Starting container on http://localhost:8888"; \
+		docker run --rm -d -p 8888:8000 --name local-code-editor local-code-editor || exit 1; \
+		docker logs -f local-code-editor; \
+	fi
+
+clean-vscode:
+	@echo "Cleaning VSCode node_modules..."
+	@find . -type d -name "node_modules" -exec rm -rf {} + 2>/dev/null || true
+	@rm -rf vscode/out/* 2>/dev/null || true
+	@echo "VSCode cleanup completed"
+
+clean: clean-vscode
+	@echo "Cleaning act temporary files and Docker images..."
+	@echo "Removing act cache..."
+	@rm -rf ~/.cache/act 2>/dev/null || true
+	@echo "Act cleanup completed"
diff --git a/README.md b/README.md
index cc5b8da21..edc7c53c2 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,26 @@ This script will:
 - Run `yarn watch` from within the `vscode` folder
 - Open a new terminal and run `./vscode/scripts/code-server.sh --launch`
 
+## Make Commands
+
+Available make targets for building and testing:
+
+### 1. When making local changes to iterate faster where tarball generation is not required [each run takes 10-20 mins]
+- `make run-local` - Build and run SageMaker Code Editor locally from source and does not require a TARBALL; this process runs a watcher so changes are automatically picked from local workspace
+- `make clean-vscode` - Cleans node_modules and out files
+
+### 2. Once local changes are tested; follow this process to generate minified tarball [each run takes ~40 mins to build] 
+- `make build-cache` - Build SageMaker Code Editor with multi-stage npm cache; Run once and layer gets cached with node_modules
+- `make build` - Build SageMaker Code Editor and output artifacts (tarball) to ./artifacts
+- `make run-local TARBALL=<tarball-name>` - Build and run SageMaker Code Editor locally on port 8888 using specified tarball from previos step. Example: `make run-local TARBALL=sagemaker-code-editor-1.101.2.tar.gz`
+
+### 3. This process is used to test and simulate github workflows locally [each run takes ~60 mins] 
+- `make run-github` - Run complete GitHub Actions workflow locally using act
+
+### 4. Cleanup
+- `make clean` - Cleans node_modules, out files, and act temporary files
+
+
 ## Troubleshooting and Feedback
 
 For any issues that customers would like to report, please route to the `amazon-sagemaker-feedback` repository: https://github.com/aws/amazon-sagemaker-feedback
@@ -38,4 +58,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform
 
 ## License
 
-This library is licensed under the MIT License. See the LICENSE file.
+This library is licensed under the MIT License. See the LICENSE file.
\ No newline at end of file
diff --git a/artifacts/sagemaker-code-editor-1.101.2.tar.gz b/artifacts/sagemaker-code-editor-1.101.2.tar.gz
new file mode 100644
index 000000000..5db3b18a4
Binary files /dev/null and b/artifacts/sagemaker-code-editor-1.101.2.tar.gz differ
diff --git a/patched-vscode/src/vs/server/node/remoteLanguagePacks.ts b/patched-vscode/src/vs/server/node/remoteLanguagePacks.ts
index ba6b17125..9e14384bb 100644
--- a/patched-vscode/src/vs/server/node/remoteLanguagePacks.ts
+++ b/patched-vscode/src/vs/server/node/remoteLanguagePacks.ts
@@ -17,7 +17,11 @@ export function getNLSConfiguration(language: string, userDataPath: string): Pro
 	let result = _cache.get(key);
 	if (!result) {
 		// The OS Locale on the remote side really doesn't matter, so we pass in the same language
+<<<<<<< HEAD
 		result = lp.getNLSConfiguration("dummy_commit", userDataPath, metaData, language, language).then(value => {
+=======
+		result = lp.getNLSConfiguration("dummy_commmit", userDataPath, metaData, language, language).then(value => {
+>>>>>>> 34c670ba (Update patched-vscode)
 			if (InternalNLSConfiguration.is(value)) {
 				value._languagePackSupport = true;
 			}
@@ -79,4 +83,8 @@ const stripComments = (content: string): string => {
 			return match;
 		}
 	});
-};
\ No newline at end of file
+<<<<<<< HEAD
+};
+=======
+};
+>>>>>>> 34c670ba (Update patched-vscode)
diff --git a/patched-vscode/src/vs/server/node/webClientServer.ts b/patched-vscode/src/vs/server/node/webClientServer.ts
index abb3138f1..e582be8c7 100644
--- a/patched-vscode/src/vs/server/node/webClientServer.ts
+++ b/patched-vscode/src/vs/server/node/webClientServer.ts
@@ -563,4 +563,4 @@ export class WebClientServer {
  			serveError(req, res, 500, error.message)
  		}
  	}
-}
+}
\ No newline at end of file
diff --git a/patched-vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/patched-vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 0c77eb25b..a427534e1 100644
--- a/patched-vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/patched-vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -3210,4 +3210,4 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 		collector.addRule(`.extension-editor .body .subcontent .runtime-status ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
 		collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
 	}
-});
+});
\ No newline at end of file
diff --git a/patches/base-path.diff b/patches/base-path.diff
deleted file mode 100644
index d4814a993..000000000
--- a/patches/base-path.diff
+++ /dev/null
@@ -1,275 +0,0 @@
-Index: sagemaker-code-editor/vscode/src/vs/base/common/network.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/base/common/network.ts
-+++ sagemaker-code-editor/vscode/src/vs/base/common/network.ts
-@@ -212,7 +212,9 @@ class RemoteAuthoritiesImpl {
- 		return URI.from({
- 			scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
- 			authority: `${host}:${port}`,
--			path: this._remoteResourcesPath,
-+			path: platform.isWeb
-+				? (window.location.pathname + "/" + this._remoteResourcesPath).replace(/\/\/+/g, "/")
-+				: this._remoteResourcesPath,
- 			query
- 		});
- 	}
-Index: sagemaker-code-editor/vscode/src/vs/base/common/product.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/base/common/product.ts
-+++ sagemaker-code-editor/vscode/src/vs/base/common/product.ts
-@@ -55,6 +55,7 @@ export type ExtensionVirtualWorkspaceSup
- };
- 
- export interface IProductConfiguration {
-+	readonly rootEndpoint?: string
- 	readonly version: string;
- 	readonly date?: string;
- 	readonly quality?: string;
-Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench-dev.html
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench-dev.html
-+++ sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench-dev.html
-@@ -36,7 +36,7 @@
- 
- 	<!-- Startup (do not modify order of script tags!) -->
- 	<script>
--		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
-+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
- 		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
- 	</script>
- 	<script>
-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 @@
- 
- 	<!-- Startup (do not modify order of script tags!) -->
- 	<script>
--		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
-+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
- 		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
- 	</script>
- 	<script>
-Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench.ts
-+++ sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.ts
-@@ -304,7 +304,8 @@ class LocalStorageURLCallbackProvider ex
- 			this.startListening();
- 		}
- 
--		return URI.parse(mainWindow.location.href).with({ path: this._callbackRoute, query: queryParams.join('&') });
-+		const path = (mainWindow.location.pathname + "/" + this._callbackRoute).replace(/\/\/+/g, "/");
-+		return URI.parse(mainWindow.location.href).with({ path: path, query: queryParams.join('&') });
- 	}
- 
- 	private startListening(): void {
- @@ -550,17 +551,6 @@ class WorkspaceProvider implements IWork
-  	}
-  }
-
- -function readCookie(name: string): string | undefined {
- -	const cookies = document.cookie.split('; ');
- -	for (const cookie of cookies) {
- -		if (cookie.startsWith(name + '=')) {
- -			return cookie.substring(name.length + 1);
- -		}
- -	}
- -
- -	return undefined;
- -}
- -
-  (function () {
-
-  	// Find config by checking for DOM
- @@ -569,8 +559,8 @@ function readCookie(name: string): strin
-  	if (!configElement || !configElementAttribute) {
-  		throw new Error('Missing web configuration element');
-  	}
- -	const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = JSON.parse(configElementAttribute);
- -	const secretStorageKeyPath = readCookie('vscode-secret-key-path');
- +	const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = { ...JSON.parse(configElementAttribute), remoteAuthority: location.host }
- +	const secretStorageKeyPath = (window.location.pathname + "/mint-key").replace(/\/\/+/g, "/");
-  	const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
-  		? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
-
-
-Index: sagemaker-code-editor/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
-+++ sagemaker-code-editor/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
-@@ -99,7 +98,7 @@ export abstract class AbstractExtensionR
- 					: version,
- 				path: 'extension'
- 			}));
--			return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
-+			return this._isWebExtensionResourceEndPoint(uri) ? URI.joinPath(URI.parse(window.location.href), uri.path) : uri;
- 		}
- 		return undefined;
- 	}
-Index: sagemaker-code-editor/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
-+++ sagemaker-code-editor/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
-@@ -281,6 +281,7 @@ export class BrowserSocketFactory implem
- 	connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
- 		return new Promise<ISocket>((resolve, reject) => {
- 			const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
-+			path = (mainWindow.location.pathname + "/" + path).replace(/\/\/+/g, "/")
- 			const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
- 			const errorListener = socket.onError(reject);
- 			socket.onOpen(() => {
-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
-@@ -246,7 +246,9 @@ export class WebClientServer {
- 		};
- 
- 		// Prefix routes with basePath for clients
--		const basePath = getFirstHeader('x-forwarded-prefix') || this._basePath;
-+       const basePath: string = this._environmentService.args['base-path'] || this._basePath;
-+		const rootBase = relativeRoot(basePath)
-+		const vscodeBase = relativePath(basePath)
- 
- 		const queryConnectionToken = parsedUrl.query[connectionTokenQueryName];
- 		if (typeof queryConnectionToken === 'string') {
-@@ -285,10 +287,14 @@ export class WebClientServer {
- 		};
- 
- 		const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
-+		// For now we are getting the remote authority from the client to avoid
-+		// needing specific configuration for reverse proxies to work.  Set this to
-+		// something invalid to make sure we catch code that is using this value
-+		// from the backend when it should not.
- 		let remoteAuthority = (
- 			useTestResolver
- 				? 'test+test'
--				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host)
-+				: 'remote'
- 		);
- 		if (!remoteAuthority) {
- 			return serveError(req, res, 400, `Bad request.`);
-@@ -335,5 +341,6 @@ export class WebClientServer {
- 
- 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
-+			rootEndpoint: rootBase,
- 			embedderIdentifier: 'server-distro',
- 			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
- 				...this._productService.extensionsGallery,
-@@ -387,7 +394,9 @@ export class WebClientServer {
- 			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
- 			WORKBENCH_WEB_BASE_URL: staticRoute,
- 			WORKBENCH_NLS_URL,
--			WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`
-+			WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`,
-+			BASE: rootBase,
-+			VS_BASE: vscodeBase,
- 		};
- 
- 		// DEV ---------------------------------------------------------------------------------------
-@@ -425,7 +434,7 @@ export class WebClientServer {
- 			'default-src \'self\';',
- 			'img-src \'self\' https: data: blob:;',
- 			'media-src \'self\';',
--			`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`,  // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
-+			`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : ``};`,  // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
- 			'child-src \'self\';',
- 			`frame-src 'self' https://*.vscode-cdn.net data:;`,
- 			'worker-src \'self\' data: blob:;',
-@@ -498,3 +507,70 @@ export class WebClientServer {
- 		return void res.end(data);
- 	}
- }
-+
-+/**
-+ * Remove extra slashes in a URL.
-+ *
-+ * This is meant to fill the job of `path.join` so you can concatenate paths and
-+ * then normalize out any extra slashes.
-+ *
-+ * If you are using `path.join` you do not need this but note that `path` is for
-+ * file system paths, not URLs.
-+ */
-+export const normalizeUrlPath = (url: string, keepTrailing = false): string => {
-+	return url.replace(/\/\/+/g, "/").replace(/\/+$/, keepTrailing ? "/" : "")
-+}
-+
-+/**
-+ * Get the relative path that will get us to the root of the page. For each
-+ * slash we need to go up a directory.  Will not have a trailing slash.
-+ *
-+ * For example:
-+ *
-+ * / => .
-+ * /foo => .
-+ * /foo/ => ./..
-+ * /foo/bar => ./..
-+ * /foo/bar/ => ./../..
-+ *
-+ * All paths must be relative in order to work behind a reverse proxy since we
-+ * we do not know the base path.  Anything that needs to be absolute (for
-+ * example cookies) must get the base path from the frontend.
-+ *
-+ * All relative paths must be prefixed with the relative root to ensure they
-+ * work no matter the depth at which they happen to appear.
-+ *
-+ * For Express `req.originalUrl` should be used as they remove the base from the
-+ * standard `url` property making it impossible to get the true depth.
-+ */
-+export const relativeRoot = (originalUrl: string): string => {
-+	const depth = (originalUrl.split("?", 1)[0].match(/\//g) || []).length
-+	return normalizeUrlPath("./" + (depth > 1 ? "../".repeat(depth - 1) : ""))
-+}
-+
-+/**
-+ * Get the relative path to the current resource.
-+ *
-+ * For example:
-+ *
-+ * / => .
-+ * /foo => ./foo
-+ * /foo/ => .
-+ * /foo/bar => ./bar
-+ * /foo/bar/ => .
-+ */
-+export const relativePath = (originalUrl: string): string => {
-+	const parts = originalUrl.split("?", 1)[0].split("/")
-+	return normalizeUrlPath("./" + parts[parts.length - 1])
-+}
-+
-+/**
-+ * code-server serves Code using Express.  Express removes the base from the url
-+ * and puts the original in `originalUrl` so we must use this to get the correct
-+ * depth.  Code is not aware it is behind Express so the types do not match.  We
-+ * may want to continue moving code into Code and eventually remove the Express
-+ * wrapper or move the web server back into code-server.
-+ */
-+export const getOriginalUrl = (req: http.IncomingMessage): string => {
-+	return (req as any).originalUrl || req.url
-+}
-Index: sagemaker-code-editor/vscode/src/vs/server/node/serverEnvironmentService.ts
-===================================================================
---- sagemaker-code-editor.orig/vscode/src/vs/server/node/serverEnvironmentService.ts
-+++ sagemaker-code-editor/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -89,6 +89,9 @@ export const serverOptions: OptionDescri
- 
- 	'compatibility': { type: 'string' },
- 
-+	/* ----- sagemaker ----- */
-+	'base-path': { type: 'string' },
-+
- 	_: OPTIONS['_']
- };
- 
-@@ -212,6 +215,9 @@ export interface ServerParsedArgs {
- 
- 	compatibility: string;
- 
-+	/* ----- sagemaker ----- */
-+	'base-path'?: string,
-+
- 	_: string[];
- }
- 
\ No newline at end of file
diff --git a/patches/custom-extensions-marketplace.diff b/patches/custom-extensions-marketplace.diff
index b6822a337..82e290a76 100644
--- a/patches/custom-extensions-marketplace.diff
+++ b/patches/custom-extensions-marketplace.diff
@@ -2,7 +2,7 @@ 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
-@@ -47,6 +47,27 @@ else if (globalThis._VSCODE_PRODUCT_JSON
+@@ -49,6 +49,14 @@ else if (globalThis._VSCODE_PRODUCT_JSON
  			version: pkg.version
  		});
  	}
@@ -12,19 +12,6 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts
 +		Object.assign(product, {
 +			extensionsGallery: JSON.parse(env['EXTENSIONS_GALLERY'])
 +		});
-+	} else {
-+		console.log(`Using default extensions gallery.`);
-+		Object.assign(product, {
-+			extensionsGallery: (product.extensionsGallery || {
-+				serviceUrl: "https://open-vsx.org/vscode/gallery",
-+				itemUrl: "https://open-vsx.org/vscode/item",
-+				resourceUrlTemplate: "https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}",
-+				controlUrl: "",
-+				recommendationsUrl: "",
-+				nlsBaseUrl: "",
-+				publisherUrl: ""
-+			})
-+		});
 +	}
 +	console.log(JSON.stringify(product.extensionsGallery, null, 2));
  }
@@ -34,15 +21,15 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
-@@ -64,6 +64,8 @@ import { createActionViewItem } from '..
- import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
- import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
- import { KeyCode } from '../../../../base/common/keyCodes.js';
+@@ -70,6 +70,8 @@ import { Codicon } from '../../../../ba
+ import { IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+ import { URI } from '../../../../base/common/uri.js';
+ import { IMcpGalleryService } from '../../../../platform/mcp/common/mcpManagement.js';
 +import { IProductService } from '../../../../platform/product/common/productService.js';
 +import { memoize } from '../../../../base/common/decorators.js';
- import { ThemeIcon } from '../../../../base/common/themables.js';
- import { Codicon } from '../../../../base/common/codicons.js';
- import { IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+ 
+ export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
+ export const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);
 @@ -531,6 +533,7 @@ export class ExtensionsViewPaneContainer
  		@ICommandService private readonly commandService: ICommandService,
  		@IMcpGalleryService private readonly mcpGalleryService: IMcpGalleryService,
@@ -75,24 +62,24 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/
  
  		const searchValue = this.searchViewletState['query.value'] ? this.searchViewletState['query.value'] : '';
  
-		const searchContainer = append(this.header, $('.extensions-search-container'));
+ 		const searchContainer = append(this.header, $('.extensions-search-container'));
 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
-@@ -335,7 +335,6 @@
-
+@@ -321,7 +321,6 @@
+ 
  		const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH);
  		const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH);
 -		const webExtensionRoute = posix.join(basePath, this._productPath, WEB_EXTENSION_PATH);
  
  		const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
  
-@@ -347,20 +346,13 @@
-		} : undefined;
-
-		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
-			embedderIdentifier: 'server-distro',
+@@ -333,20 +332,13 @@
+ 		} : undefined;
+ 
+ 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
+ 			embedderIdentifier: 'server-distro',
 -			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
 -				...this._productService.extensionsGallery,
 -				resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({
@@ -109,7 +96,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  			productConfiguration.extensionsEnabledWithApiProposalVersion ??= [];
  			productConfiguration.extensionsEnabledWithApiProposalVersion.push(...proposedApi);
  		}
-
+ 
 Index: sagemaker-code-editor/vscode/product.json
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/product.json
diff --git a/patches/disable-online-services.diff b/patches/disable-online-services.diff
index b8eba7aa4..bc9002885 100644
--- a/patches/disable-online-services.diff
+++ b/patches/disable-online-services.diff
@@ -11,6 +11,15 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.
  			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'],
+@@ -42,7 +42,7 @@ configurationRegistry.registerConfigurat
+ 		},
+ 		'update.enableWindowsBackgroundUpdates': {
+ 			type: 'boolean',
+-			default: true,
++			default: false,
+ 			scope: ConfigurationScope.APPLICATION,
+ 			title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates on Windows"),
+ 			description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background on Windows."),
 @@ -50,7 +50,7 @@ configurationRegistry.registerConfigurat
  		},
  		'update.showReleaseNotes': {
@@ -20,19 +29,6 @@ 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
diff --git a/patches/disable-telemetry.diff b/patches/disable-telemetry.diff
index 725622d97..f4afacf29 100644
--- a/patches/disable-telemetry.diff
+++ b/patches/disable-telemetry.diff
@@ -6,7 +6,7 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetrySe
 ===================================================================
 --- 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
+@@ -209,7 +209,7 @@ Registry.as<IConfigurationRegistry>(Exte
  	'properties': {
  		[TELEMETRY_SETTING_ID]: {
  			'type': 'string',
@@ -15,7 +15,7 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetrySe
  			'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
+@@ -217,7 +217,7 @@ Registry.as<IConfigurationRegistry>(Exte
  				localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
  			],
  			'markdownDescription': getTelemetryLevelSettingDescription(),
@@ -24,11 +24,20 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetrySe
  			'restricted': true,
  			'scope': ConfigurationScope.APPLICATION,
  			'tags': ['usesOnlineServices', 'telemetry']
+@@ -243,7 +243,7 @@ configurationRegistry.registerConfigurat
+ 				!product.privacyStatementUrl ?
+ 					localize('telemetry.enableTelemetry', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made.", product.nameLong) :
+ 					localize('telemetry.enableTelemetryMd', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.", product.nameLong, product.privacyStatementUrl),
+-			'default': true,
++			'default': false,
+ 			'restricted': true,
+ 			'markdownDeprecationMessage': localize('enableTelemetryDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
+ 			'scope': ConfigurationScope.APPLICATION,
 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
+@@ -322,7 +322,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."),
@@ -41,7 +50,7 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/1dsAppender
 ===================================================================
 --- 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 {
+@@ -19,8 +19,8 @@ export interface IAppInsightsCore {
  	unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
  }
  
diff --git a/patches/display-language.patch b/patches/display-language.patch
index 95c9a2197..d0c476364 100644
--- a/patches/display-language.patch
+++ b/patches/display-language.patch
@@ -71,6 +71,7 @@ Index: sagemaker-code-editor/vscode/src/vs/base/common/platform.ts
  }
  
  // Unknown environment
+
 Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.html
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench.html
@@ -186,7 +187,6 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/languagePacks/browser/langua
 +		return this.languagePackService.getInstalledLanguages()
  	}
  }
-
 Index: sagemaker-code-editor/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/server/node/serverEnvironmentService.ts
@@ -223,7 +223,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/serverServices.ts
  import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
  import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
  import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
-@@ -225,6 +225,9 @@ export async function setupServerService
+@@ -241,6 +241,9 @@ export async function setupServerService
  		const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
  		socketServer.registerChannel('extensions', channel);
 
@@ -238,7 +238,7 @@ 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
-@@ -401,7 +405,7 @@ export class WebClientServer {
+@@ -428,7 +437,7 @@ export class WebClientServer {
  			`frame-src 'self' https://*.vscode-cdn.net data:;`,
  			'worker-src \'self\' data: blob:;',
  			'style-src \'self\' \'unsafe-inline\';',
@@ -339,4 +339,4 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/services/localization/elect
 -		}
  		await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['locale'], value: locale }], true);
  		return true;
- 	}
+ 	}
\ No newline at end of file
diff --git a/patches/local-storage.diff b/patches/local-storage.diff
index 25d9c3d9f..fadc4ed84 100644
--- a/patches/local-storage.diff
+++ b/patches/local-storage.diff
@@ -20,7 +20,7 @@ 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 {
+@@ -360,6 +360,7 @@ export class WebClientServer {
  		const workbenchWebConfiguration = {
  			remoteAuthority,
 			serverBasePath: basePath,
@@ -33,7 +33,7 @@ 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/post-startup-notifications.patch b/patches/post-startup-notifications.patch
index d14eaf8bc..5d9d4d534 100644
--- a/patches/post-startup-notifications.patch
+++ b/patches/post-startup-notifications.patch
@@ -750,7 +750,7 @@ 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
-@@ -65,6 +65,7 @@ const compilations = [
+@@ -64,6 +64,7 @@ const compilations = [
  	'extensions/sagemaker-terminal-crash-mitigation/tsconfig.json',
  	'extensions/sagemaker-open-notebook-extension/tsconfig.json',
  	'extensions/sagemaker-ui-dark-theme/tsconfig.json',
diff --git a/patches/sagemaker-extension.diff b/patches/sagemaker-extension.diff
index 8e957d9f6..91bba0932 100644
--- a/patches/sagemaker-extension.diff
+++ b/patches/sagemaker-extension.diff
@@ -302,7 +302,7 @@ 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 = [
+@@ -60,6 +60,7 @@ const compilations = [
 	'extensions/references-view/tsconfig.json',
 	'extensions/search-result/tsconfig.json',
 	'extensions/simple-browser/tsconfig.json',
@@ -336,20 +336,11 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/tsconfig.json
 +		"../../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 = [
+@@ -38,6 +38,7 @@ const dirs = [
  	'extensions/npm',
  	'extensions/php-language-features',
  	'extensions/references-view',
diff --git a/patches/sagemaker-idle-extension.patch b/patches/sagemaker-idle-extension.patch
index f475f6071..c3d8e9c85 100644
--- a/patches/sagemaker-idle-extension.patch
+++ b/patches/sagemaker-idle-extension.patch
@@ -267,7 +267,7 @@ 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 = [
+@@ -39,6 +39,7 @@ const dirs = [
  	'extensions/php-language-features',
  	'extensions/references-view',
  	'extensions/sagemaker-extension',
@@ -296,7 +296,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  
  export class WebClientServer {
  
-@@ -131,6 +132,9 @@ export class WebClientServer {
+@@ -132,6 +133,9 @@ export class WebClientServer {
  				// callback support
  				return this._handleCallback(res);
  			}
@@ -336,3 +336,5 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
 + 		}
 + 	}
  }
+ 
+ /**
diff --git a/patches/sagemaker-open-notebook-extension.patch b/patches/sagemaker-open-notebook-extension.patch
index ad3dc5aac..d845d167e 100644
--- a/patches/sagemaker-open-notebook-extension.patch
+++ b/patches/sagemaker-open-notebook-extension.patch
@@ -2,7 +2,7 @@ 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 = [
+@@ -61,6 +61,7 @@ const compilations = [
  	'extensions/sagemaker-extension/tsconfig.json',
  	'extensions/sagemaker-idle-extension/tsconfig.json',
  	'extensions/sagemaker-terminal-crash-mitigation/tsconfig.json',
@@ -42,7 +42,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-@@ -950,6 +950,17 @@ export class ExtensionsWorkbenchService
+@@ -1084,6 +1084,17 @@ export class ExtensionsWorkbenchService
  		urlService.registerHandler(this);
  
  		this.whenInitialized = this.initialize();
diff --git a/patches/sagemaker-ui-post-startup.patch b/patches/sagemaker-ui-post-startup.patch
index 1d7e34933..43aef3835 100644
--- a/patches/sagemaker-ui-post-startup.patch
+++ b/patches/sagemaker-ui-post-startup.patch
@@ -11,7 +11,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  import * as url from 'url';
  import * as cookie from 'cookie';
  import * as crypto from 'crypto';
-@@ -30,6 +32,10 @@ const textMimeType: { [ext: string]: st
+@@ -37,6 +39,10 @@ const textMimeType: { [ext: string]: str
  	'.svg': 'image/svg+xml',
  };
  
@@ -22,7 +22,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  /**
   * Return an error to the client.
   */
-@@ -93,6 +99,7 @@ const STATIC_PATH = `/static`;
+@@ -96,6 +102,7 @@ const STATIC_PATH = `/static`;
  const CALLBACK_PATH = `/callback`;
  const WEB_EXTENSION_PATH = `/web-extension-resource`;
  const IDLE_EXTENSION_PATH = `/api/idle`;
@@ -40,7 +40,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  			if (pathname.startsWith(WEB_EXTENSION_PATH) && pathname.charCodeAt(WEB_EXTENSION_PATH.length) === CharCode.Slash) {
  				// extension resource support
  				return this._handleWebExtensionResource(req, res, pathname.substring(WEB_EXTENSION_PATH.length));
-@@ -507,4 +517,39 @@ export class WebClientServer {
+@@ -505,4 +515,39 @@ export class WebClientServer {
  			serveError(req, res, 500, error.message)
  		}
  	}
diff --git a/patches/tar-fs-upgrade.patch b/patches/tar-fs-upgrade.patch
deleted file mode 100644
index c4c6c706a..000000000
--- a/patches/tar-fs-upgrade.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: sagemaker-code-editor/vscode/build/yarn.lock
-===================================================================
---- sagemaker-code-editor.orig/vscode/build/yarn.lock
-+++ sagemaker-code-editor/vscode/build/yarn.lock
-@@ -2567,9 +2567,9 @@ supports-color@^7.1.0:
-     has-flag "^4.0.0"
- 
- tar-fs@^2.0.0:
--  version "2.1.1"
--  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
--  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-+  version "2.1.3"
-+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
-+  integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==
-   dependencies:
-     chownr "^1.1.1"
-     mkdirp-classic "^0.5.2"
-Index: sagemaker-code-editor/vscode/remote/yarn.lock
-===================================================================
---- sagemaker-code-editor.orig/vscode/remote/yarn.lock
-+++ sagemaker-code-editor/vscode/remote/yarn.lock
-@@ -587,9 +587,9 @@ strip-json-comments@~2.0.1:
-   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
- 
- tar-fs@^2.0.0:
--  version "2.1.1"
--  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
--  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-+  version "2.1.3"
-+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
-+  integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==
-   dependencies:
-     chownr "^1.1.1"
-     mkdirp-classic "^0.5.2"
\ No newline at end of file
diff --git a/patches/terminal-crash-mitigation.patch b/patches/terminal-crash-mitigation.patch
index 44a95e9ed..1dbda28c8 100644
--- a/patches/terminal-crash-mitigation.patch
+++ b/patches/terminal-crash-mitigation.patch
@@ -2,7 +2,7 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-terminal-crash-mitigati
 ===================================================================
 --- /dev/null
 +++ sagemaker-code-editor/vscode/extensions/sagemaker-terminal-crash-mitigation/.vscodeignore
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,11 @@
 +.vscode/**
 +.vscode-test/**
 +out/test/**
@@ -13,7 +13,6 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-terminal-crash-mitigati
 +out/test/**
 +out/**
 +cgmanifest.json
-+yarn.lock
 +preview-src/**
 Index: sagemaker-code-editor/vscode/extensions/sagemaker-terminal-crash-mitigation/extension-browser.webpack.config.js
 ===================================================================
diff --git a/patches/webview.diff b/patches/webview.diff
index 66d26f7e4..9e95907b2 100644
--- a/patches/webview.diff
+++ b/patches/webview.diff
@@ -44,7 +44,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/services/environment/browse
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
-@@ -225,7 +225,7 @@ export class BrowserWorkbenchEnvironment
+@@ -227,7 +227,7 @@ export class BrowserWorkbenchEnvironment
  
  	@memoize
  	get webviewExternalEndpoint(): string {
@@ -57,7 +57,7 @@ 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
-@@ -323,6 +323,7 @@ export class WebClientServer {
+@@ -364,6 +364,7 @@ export class WebClientServer {
  		const workbenchWebConfiguration = {
  			remoteAuthority,
  			serverBasePath: basePath,
@@ -74,11 +74,11 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre
 
  	<meta http-equiv="Content-Security-Policy"
 -		content="default-src 'none'; script-src 'sha256-gEAyFzmkyqMoTTnN+3KReFUYoHsK4RAJEb+6eiul+UY=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
-+		content="default-src 'none'; script-src 'sha256-ap/AtocvSWp0rrxaO19DJy/nOpazT6M5Cv9utUWe7MA=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
++		content="default-src 'none'; script-src 'sha256-1qYtPnTQa4VwKNJO61EOhs2agF9TvuQSYIJ27OgzZqI=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
  	<!-- Disable pinch zooming -->
  	<meta name="viewport"
-@@ -344,6 +344,12 @@
+@@ -351,6 +351,12 @@
  
  				const hostname = location.hostname;
  
@@ -101,7 +101,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/services/extensions/worker/
  			default-src 'none';
  			child-src 'self' data: blob:;
 -			script-src 'self' 'unsafe-eval' 'sha256-cl8ijlOzEe+0GRCQNJQu2k6nUQ0fAYNYIuuKEm72JDs=' https: http://localhost:* blob:;
-+			script-src 'self' 'unsafe-eval' 'sha256-c7vPrYRaSLDtFSrI4CuHYgBQ3a4c4x2LSm/LefSZADQ=' https:;
++			script-src 'self' 'unsafe-eval' 'sha256-yhZXuB8LS6t73dvNg6rtLX8y4PHLnqRm5+6DdOGkOcw=' https:;
  			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
  	</head>
  	<body>
diff --git a/scripts/Dockerfile.build b/scripts/Dockerfile.build
new file mode 100644
index 000000000..b8fff5098
--- /dev/null
+++ b/scripts/Dockerfile.build
@@ -0,0 +1,27 @@
+FROM npm-cache:latest AS builder
+
+WORKDIR /workspace
+
+# Declare a build argument to control the minify flag
+ARG ARGS
+
+# Copy source files except vscode so new patches are picked up without cache busting
+COPY patches ./patches
+COPY resources ./resources
+COPY .git ./.git
+COPY scripts/ ./scripts/
+COPY .pc ./.pc
+COPY LICENSE .
+COPY LICENSE-THIRD-PARTY .
+
+# Apply patches and build
+RUN chmod +x scripts/docker-install.sh && \
+    ./scripts/docker-install.sh -t "$(cat vscode/package.json | grep '"version"' | cut -d'"' -f4)"
+
+RUN echo "Build arguments: $ARGS"
+RUN chmod +x scripts/create-code-editor-tarball.sh && \
+    ./scripts/create-code-editor-tarball.sh -v "$(cat vscode/package.json | grep '"version"' | cut -d'"' -f4)"
+
+# Final stage: Minimal image with only the build artifacts to copy from
+FROM scratch
+COPY --from=builder /workspace/artifacts .
\ No newline at end of file
diff --git a/scripts/Dockerfile.build.cache b/scripts/Dockerfile.build.cache
new file mode 100644
index 000000000..1085ed1e1
--- /dev/null
+++ b/scripts/Dockerfile.build.cache
@@ -0,0 +1,43 @@
+FROM ubuntu:24.04 AS base-image
+
+# Install required tools and Node.js
+RUN apt-get update && apt-get install -y \
+    git \
+    python3 \
+    python3-pip \
+    build-essential \
+    curl \
+    quilt \
+    pkg-config \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    libkrb5-dev \
+    libgssapi-krb5-2 \
+    time \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js 22 (latest LTS)
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get install -y nodejs
+
+# Stage 2: NPM Dependencies Cache
+# This stage uses the pre-configured base-image to build the cache.
+FROM base-image AS npm-cache
+
+WORKDIR /workspace
+
+COPY vscode ./vscode
+COPY patches ./patches
+COPY resources ./resources
+COPY .git ./.git
+COPY scripts/postinstall.sh ./scripts/postinstall.sh
+COPY scripts/docker-install.sh ./scripts/docker-install.sh
+COPY scripts/copy-resources.sh ./scripts/copy-resources.sh
+COPY .pc ./.pc
+COPY LICENSE .
+COPY LICENSE-THIRD-PARTY .
+
+# Apply patches and build
+RUN chmod +x scripts/docker-install.sh && \
+    ./scripts/docker-install.sh -t "$(cat vscode/package.json | grep '"version"' | cut -d'"' -f4)"
\ No newline at end of file
diff --git a/scripts/Dockerfile.dev b/scripts/Dockerfile.dev
new file mode 100644
index 000000000..bbc34c3ec
--- /dev/null
+++ b/scripts/Dockerfile.dev
@@ -0,0 +1,36 @@
+FROM ubuntu:24.04 AS base-image
+
+# Install required tools and Node.js
+RUN apt-get update && apt-get install -y \
+    git \
+    python3 \
+    python3-pip \
+    build-essential \
+    curl \
+    quilt \
+    pkg-config \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    libkrb5-dev \
+    libgssapi-krb5-2 \
+    time \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js 22 (latest LTS)
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get install -y nodejs
+
+# Stage 2: NPM Dependencies Cache
+# This stage uses the pre-configured base-image to build the cache.
+FROM base-image AS npm-cache
+
+# Install supervisord
+RUN apt-get update && \
+    apt-get install -y supervisor
+
+WORKDIR /workspace
+
+EXPOSE 8080
+
+# Following is the entrypoint script for local runs: /workspace/scripts/run-code-editor-dev.sh
\ No newline at end of file
diff --git a/scripts/Dockerfile.run b/scripts/Dockerfile.run
new file mode 100644
index 000000000..61812b656
--- /dev/null
+++ b/scripts/Dockerfile.run
@@ -0,0 +1,24 @@
+FROM public.ecr.aws/sagemaker/sagemaker-distribution:latest-cpu
+
+# Accept tarball name as build argument
+ARG TARBALL=code-editor1.8.0b5.tar.gz
+
+# Switch to root to install
+USER root
+
+# Copy and extract the code editor to /tmp
+COPY .artifacts/${TARBALL} /tmp/
+RUN cd /tmp && tar -xzf ${TARBALL}
+
+# Move to final location and set permissions
+RUN mv /tmp/sagemaker-code-editor /opt/ && \
+    chmod +x /opt/sagemaker-code-editor/bin/code-server-oss
+
+# Add to PATH
+ENV PATH="/opt/sagemaker-code-editor/bin:$PATH"
+
+# Expose port
+EXPOSE 8000
+
+# Run code-server-oss with host binding to all interfaces
+CMD ["code-server-oss", "--host", "0.0.0.0", "--without-connection-token"]
\ No newline at end of file
diff --git a/scripts/create-code-editor-tarball.sh b/scripts/create-code-editor-tarball.sh
new file mode 100644
index 000000000..2f0714bad
--- /dev/null
+++ b/scripts/create-code-editor-tarball.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+while getopts "v:m" opt; do
+  case $opt in
+    v) version="$OPTARG"
+    ;;
+    ?) usage; exit 1 ;;
+  esac
+done
+
+if [[ -z $version ]]; then
+ echo "Please provide version using '-v'";
+ exit 1
+fi
+
+VERSION=$version
+
+# Set current project root
+PROJ_ROOT=$(pwd)
+
+pushd ${PROJ_ROOT}/vscode
+
+printf "\n======== Running gulp build task ========\n"
+export DISABLE_V8_COMPILE_CACHE=1
+export UV_THREADPOOL_SIZE=4
+export ARCH_ALIAS=linux-x64
+export NODE_ENV=production
+export MINIFY=true
+node --max-old-space-size=16384 --optimize-for-size \
+    ./node_modules/gulp/bin/gulp.js \
+    "vscode-reh-web-${ARCH_ALIAS}${MINIFY:+-min}"
+
+popd
+
+TARBALL="sagemaker-code-editor-${VERSION}.tar.gz"
+BUILD_DIR_PATH=.artifacts
+
+mv vscode-reh-web-linux-x64 sagemaker-code-editor
+mkdir ${BUILD_DIR_PATH}
+tar -czf ${BUILD_DIR_PATH}/${TARBALL} sagemaker-code-editor 
+sha256sum ${BUILD_DIR_PATH}/${TARBALL}
\ No newline at end of file
diff --git a/scripts/create_code_editor_tarball.sh b/scripts/create_code_editor_tarball.sh
deleted file mode 100644
index 6ae444092..000000000
--- a/scripts/create_code_editor_tarball.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-while getopts "v:" opt; do
-  case $opt in
-    v) version="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    exit 1
-    ;;
-  esac
-
-  case $OPTARG in
-    -*) echo "Option $opt needs a valid argument"
-    exit 1
-    ;;
-  esac
-done
-
-if [[ -z $version ]]; then
- echo "Please provide version using '-v'";
- exit 1
-fi
-
-VERSION=$version
-# Set current project root
-PROJ_ROOT=$(pwd)
-
-mkdir -p ${PROJ_ROOT}/sagemaker-code-editor/code-editor${VERSION}
-rm -rf ${PROJ_ROOT}/sagemaker-code-editor/code-editor${VERSION}/src
-mkdir -p ${PROJ_ROOT}/sagemaker-code-editor/code-editor${VERSION}/src
-cp -a ${PROJ_ROOT}/vscode/. ${PROJ_ROOT}/sagemaker-code-editor/code-editor${VERSION}/src/
-rm -rf ${PROJ_ROOT}/sagemaker-code-editor/code-editor${VERSION}.tar.gz
-cd ${PROJ_ROOT}/sagemaker-code-editor
-tar -czf code-editor${VERSION}.tar.gz code-editor${VERSION}
-cd ${PROJ_ROOT}
-cp ${PROJ_ROOT}/sagemaker-code-editor/code-editor${VERSION}.tar.gz ${PROJ_ROOT}/
-rm -rf ${PROJ_ROOT}/sagemaker-code-editor
-sha256sum ${PROJ_ROOT}/code-editor${VERSION}.tar.gz
diff --git a/scripts/docker-install.sh b/scripts/docker-install.sh
new file mode 100644
index 000000000..e5068de0e
--- /dev/null
+++ b/scripts/docker-install.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# ONLY FOR LOCAL BUILD USECASE
+# This script is intended to be run inside the docker container
+# It will setup the environment and build the project within the container
+
+# set +e to prevent quilt from exiting when no patches popped
+set +e
+
+# Set current project root
+PROJ_ROOT=$(pwd)
+
+# Clean out patches
+printf "\n======== Cleaning out patches ========\n"
+quilt pop -a
+rm -rf .pc
+
+# re-enable -e to allow exiting on error
+set -e
+
+# make sure module is current
+printf "\n======== Updating submodule ========\n"
+git submodule update --init
+
+# Apply patches
+printf "\n======== Applying patches ========\n"
+
+if [ -d patches ] && [ "$(ls -A patches)" ]; then
+  {
+    quilt push -a --leave-rejects --color=auto 
+  } || {
+    printf "\nPatching error, review logs!\n"
+    find ./vscode -name "*.rej"
+    exit 1
+  }
+fi
+
+
+# Generate Licenses
+printf "\n======== Generate Licenses ========\n"
+cd ${PROJ_ROOT}/vscode
+cp LICENSE.txt LICENSE.vscode.txt
+cp ThirdPartyNotices.txt LICENSE-THIRD-PARTY.vscode.txt
+cp ../LICENSE-THIRD-PARTY .
+
+cd ${PROJ_ROOT}
+# Comment out breaking lines in postinstall.js
+printf "\n======== Comment out breaking git config lines in postinstall.js ========\n"
+sh ${PROJ_ROOT}/scripts/postinstall.sh
+
+# Copy resources
+printf "\n======== Copy resources ========\n"
+${PROJ_ROOT}/scripts/copy-resources.sh
+
+# Build the project
+printf "\n======== Building project in ${PROJ_ROOT}/vscode ========\n"
+cd ${PROJ_ROOT}/vscode
+npm config set cache ~/.npm --global
+npm install -g node-gyp
+npm install --use-cache --no-audit --no-fund --prefer-offline --verbose --no-optional
+npm run download-builtin-extensions --prefer-offline --verbose
\ No newline at end of file
diff --git a/scripts/install.sh b/scripts/install.sh
old mode 100644
new mode 100755
index 246c81c02..abd9d057d
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -93,4 +93,4 @@ printf "\n======== Building project in ${PROJ_ROOT}/vscode ========\n"
 # npm --cwd "${PROJ_ROOT}/vscode" download-builtin-extensions
 cd ${PROJ_ROOT}/vscode
 npm install
-npm download-builtin-extensions
+npm download-builtin-extensions
\ No newline at end of file
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
old mode 100644
new mode 100755
index cbeb5f9f7..7607b2845
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -30,4 +30,4 @@ else
     sed -i '/cp\.execSync('"'"'git config .*);/s/^/\/\/ /' "$POSTINSTALL_JS_PATH"
 fi
 
-echo "Specified git config lines have been commented out in $POSTINSTALL_JS_PATH."
+echo "Specified git config lines have been commented out in $POSTINSTALL_JS_PATH."
\ No newline at end of file
diff --git a/scripts/run-code-editor-dev.sh b/scripts/run-code-editor-dev.sh
new file mode 100755
index 000000000..c881aae3b
--- /dev/null
+++ b/scripts/run-code-editor-dev.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# ONLY FOR LOCAL DEV USECASE
+# This script is intended to be run inside the docker container
+# It will setup the environment and start the code editor in watch mode within the container
+
+set +e
+
+# Set current project root
+PROJ_ROOT=$(pwd)
+
+# Clean out patches
+printf "\n======== Cleaning out patches ========\n"
+quilt pop -a
+rm -rf .pc
+
+# re-enable -e to allow exiting on error
+set -e
+
+# make sure module is current
+printf "\n======== Updating submodule ========\n"
+git config --global --add safe.directory /workspace
+git submodule update --init
+
+# Apply patches
+printf "\n======== Applying patches ========\n"
+{
+  quilt push -a --leave-rejects --color=auto 
+} || {
+  printf "\nPatching error, review logs!\n"
+  find ./vscode -name "*.rej"
+  exit 1
+}
+
+cd ${PROJ_ROOT}
+# Comment out breaking lines in postinstall.js
+printf "\n======== Comment out breaking git config lines in postinstall.js ========\n"
+sh ${PROJ_ROOT}/scripts/postinstall.sh
+
+# Copy resources
+printf "\n======== Copy resources ========\n"
+${PROJ_ROOT}/scripts/copy-resources.sh
+
+# Build the project
+printf "\n======== Installing dependencies ========\n"
+cd ${PROJ_ROOT}/vscode
+
+# Install dependencies
+npm install
+npm run download-builtin-extensions
+
+printf "\n======== Starting Code Editor and Watch process using supervisord ========\n"
+
+npm run watch &
+sleep 300
+
+# This script can be directly used to run code server without supervisord
+# ./scripts/code-server.sh --host 0.0.0.0 --port 8000 --without-connection-token
+
+# Create supervisord config to run code server
+cat > /etc/supervisor/supervisord.conf << EOF
+[unix_http_server]
+file=/var/run/supervisor.sock
+
+[supervisord]
+logfile=/var/log/supervisord.log
+pidfile=/var/run/supervisord.pid
+nodaemon=false
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
+EOF
+
+# Start supervisor daemon
+/usr/bin/supervisord -c /etc/supervisor/supervisord.conf &
+sleep 2
+
+# Create supervisor config file for code server
+cat > /etc/supervisor/conf.d/vscode-server.conf << EOF
+[program:vscode-server]
+directory=/workspace/vscode
+command=./scripts/code-server.sh --host 0.0.0.0 --port 8000 --without-connection-token
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/vscode-server.err.log
+stdout_logfile=/var/log/vscode-server.out.log
+EOF
+
+# Reload supervisor config
+supervisorctl reread
+supervisorctl update
+
+supervisorctl start vscode-server
+
+# Keep container running and show logs
+tail -f /var/log/vscode-*.log
\ No newline at end of file
diff --git a/scripts/test-local.sh b/scripts/test-local.sh
old mode 100644
new mode 100755