diff --git a/containers/python-3-jupyter-pyspark/.jupyter/jupyter_notebook_config.py b/containers/python-3-jupyter-pyspark/.jupyter/jupyter_notebook_config.py
new file mode 100644
index 0000000000..1c28e91a6d
--- /dev/null
+++ b/containers/python-3-jupyter-pyspark/.jupyter/jupyter_notebook_config.py
@@ -0,0 +1,3 @@
+c.NotebookApp.open_browser = False
+c.NotebookApp.port = 8888
+c.NotebookApp.token = '1e8a4466-396e-4a1b-bec6-729de2772f29'
diff --git a/containers/python-3-jupyter-pyspark/.vscode/devContainer.json b/containers/python-3-jupyter-pyspark/.vscode/devContainer.json
index 43435d9326..aa6897b7b6 100644
--- a/containers/python-3-jupyter-pyspark/.vscode/devContainer.json
+++ b/containers/python-3-jupyter-pyspark/.vscode/devContainer.json
@@ -1,9 +1,9 @@
 {
 	"name": "Jupyter PySpark",
-	"image": "jupyter/pyspark-notebook",
-	"appPort": 8888,
+	"dockerComposeFile": "docker-compose.dev-container.yml",
+	"service": "jupyter",
+	"volume": "notebook",
 	"extensions": [
-		"ms-python.python",
-		"LittleFoxTeam.vscode-python-test-adapter"
+		"ms-python.python"
 	]
 }
diff --git a/containers/python-3-jupyter-pyspark/.vscode/settings.json b/containers/python-3-jupyter-pyspark/.vscode/settings.json
index fc9ffdf729..5922d3a781 100644
--- a/containers/python-3-jupyter-pyspark/.vscode/settings.json
+++ b/containers/python-3-jupyter-pyspark/.vscode/settings.json
@@ -1,7 +1,6 @@
 {
     "python.linting.enabled": false,
-    "python.dataScience.useDefaultConfigForJupyter": true,
     "python.dataScience.notebookFileRoot": "${workspaceFolder}/test-project",
-    "python.pythonPath": "/opt/conda/bin/python"
-
+    "python.pythonPath": "/opt/conda/bin/python",
+    "python.dataScience.jupyterServerURI": "http://localhost:8888?token=1e8a4466-396e-4a1b-bec6-729de2772f29"
 }
\ No newline at end of file
diff --git a/containers/python-3-jupyter-pyspark/dev-container.dockerfile b/containers/python-3-jupyter-pyspark/dev-container.dockerfile
deleted file mode 100644
index 0ed7173beb..0000000000
--- a/containers/python-3-jupyter-pyspark/dev-container.dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM jupyter/pyspark-notebook
-
-USER root
-
-# Install git
-RUN apt-get update && apt-get -y install git
-
-# Install any missing dependencies for enhanced language service
-RUN apt-get install -y libicu57
-
-# Clean up
-RUN apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
diff --git a/containers/python-3-jupyter-pyspark/docker-compose.dev-container.yml b/containers/python-3-jupyter-pyspark/docker-compose.dev-container.yml
new file mode 100644
index 0000000000..9fa408edd4
--- /dev/null
+++ b/containers/python-3-jupyter-pyspark/docker-compose.dev-container.yml
@@ -0,0 +1,10 @@
+version: '3'
+services:
+  jupyter:
+    image: jupyter/pyspark-notebook
+    ports:
+     - "8888:8888"
+    volumes:
+      - .:/notebook
+      - ./.jupyter:/home/jovyan/.jupyter
+