From 31d21d78e061790db69b8ee0ac3d1259bf4d3faa Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 27 Jun 2025 15:52:04 +0530
Subject: [PATCH 01/19] Update to v0.3.0, introducing support for MATLAB R2025a

---
 src/matlab/devcontainer-feature.json          |  5 +++--
 src/matlab/install-helper-functions.sh        |  2 +-
 src/matlab/install.sh                         |  7 ++++---
 test/matlab/install_release_on_ubuntu24.04.sh | 14 ++++++++++++++
 test/matlab/scenarios.json                    | 16 ++++++++++++----
 test/matlab/test.sh                           |  6 +++---
 6 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 test/matlab/install_release_on_ubuntu24.04.sh

diff --git a/src/matlab/devcontainer-feature.json b/src/matlab/devcontainer-feature.json
index edf23e9..67c7ac4 100644
--- a/src/matlab/devcontainer-feature.json
+++ b/src/matlab/devcontainer-feature.json
@@ -1,13 +1,14 @@
 {
     "name": "MATLAB",
     "id": "matlab",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "Installs MATLAB with supporting packages and tools.",
     "documentationURL": "https://github.com/mathworks/devcontainer-features",
     "options": {
         "release": {
             "type": "string",
             "proposals": [
+                "R2025a",
                 "R2024b",
                 "R2024a",
                 "R2023b",
@@ -21,7 +22,7 @@
                 "R2019b",
                 "R2019a"
             ],
-            "default": "R2024b",
+            "default": "R2025a",
             "description": "MATLAB Release to install."
         },
         "products": {
diff --git a/src/matlab/install-helper-functions.sh b/src/matlab/install-helper-functions.sh
index 513547f..5a35e89 100755
--- a/src/matlab/install-helper-functions.sh
+++ b/src/matlab/install-helper-functions.sh
@@ -136,7 +136,7 @@ function ihf_get_remove_cmd() {
 # returns "true/false" string if MATLAB_RELEASE is valid
 function ihf_is_valid_matlab_release() {
     # List of supported MATLAB_RELEASE values
-    local _SUPPORTED_MATLAB_RELEASES=("R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
+    local _SUPPORTED_MATLAB_RELEASES=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
     
     ## Validate MATLAB_RELEASE
     if [ -z "$MATLAB_RELEASE" ]; then
diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index c5fc3ad..712d6f2 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -17,8 +17,8 @@ set -eu -o pipefail
 
 ## Set defaults to all the options in the feature.
 
-# R2024b is the latest available release.
-RELEASE="${RELEASE:-"R2024b"}"
+# R2025a is the latest available release.
+RELEASE="${RELEASE:-"R2025a"}"
 PRODUCTS="${PRODUCTS:-"MATLAB"}"
 DOC="${DOC:-"false"}"
 INSTALLGPU="${INSTALLGPU:-"false"}"
@@ -92,6 +92,7 @@ function install_matlab_engine_for_python() {
     # Installing the engine is tricky
     # The installation can fail if the python version does not match the supported release
     declare -A matlabengine_map
+    matlabengine_map['R2025a']="25.1"
     matlabengine_map['R2024b']="24.2"
     matlabengine_map['R2024a']="24.1"
     matlabengine_map['R2023b']="23.2"
@@ -225,7 +226,7 @@ if [ "$SKIPMATLABINSTALL" != 'true' ]; then
     
     # Handle GPU installation
     if [ "${INSTALLGPU}" == "false" ]; then
-        RELEASES_THAT_SUPPORT_NOGPU=("R2024b" "R2024a" "R2023b" "R2023a")
+        RELEASES_THAT_SUPPORT_NOGPU=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a")
         # The value variable is assigned a regex that matches the exact value
         value="\<${MATLAB_RELEASE}\>"
         if [[ ${RELEASES_THAT_SUPPORT_NOGPU[@]} =~ $value ]]; then
diff --git a/test/matlab/install_release_on_ubuntu24.04.sh b/test/matlab/install_release_on_ubuntu24.04.sh
new file mode 100644
index 0000000..32fbd59
--- /dev/null
+++ b/test/matlab/install_release_on_ubuntu24.04.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+## Execute the command below from the root folder of the feature to run this test in isolation:
+# devcontainer features test --features matlab --skip-autogenerated --filter install_release_on_ubuntu24.04
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+check "r2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index 638cf72..74aeb13 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -1,9 +1,17 @@
 {
-    "install_release_on_ubuntu":{
+    "install_release_on_ubuntu24.04": {
+        "image": "ubuntu:24.04",
+        "features": {
+            "matlab": {
+                "release": "r2025a"
+            }
+        }
+    },
+    "install_release_on_ubuntu": {
         "image": "ubuntu:22.04",
-        "features":{
-            "matlab":{
-                "release" : "r2022b"
+        "features": {
+            "matlab": {
+                "release": "r2022b"
             }
         }
     },
diff --git a/test/matlab/test.sh b/test/matlab/test.sh
index 22df139..cbe3fee 100644
--- a/test/matlab/test.sh
+++ b/test/matlab/test.sh
@@ -19,9 +19,9 @@
 #
 # Thus, the value of all options will fall back to the default value in
 # the Feature's 'devcontainer-feature.json'.
-# For the 'matlab' feature, that means the default version installed in R2024b
+# For the 'matlab' feature, that means the default version installed in R2025a
 # These are the default values that are passed into the feature:
-#     RELEASE="R2024b"
+#     RELEASE="R2025a"
 #     OS="ubuntu22.04"
 #     PRODUCTS="MATLAB"
 #     DOC="false"
@@ -56,7 +56,7 @@ source dev-container-features-test-lib
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib. Syntax is...
 # check <LABEL> <cmd> [args...]
-check "R2024b is installed" bash -c "cat /opt/matlab/R2024b/VersionInfo.xml | grep '<release>R2024b</release>'"
+check "R2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.

From c0ff4cd4c281bde9bb5c9a9aff62b3ae7f8fed44 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 27 Jun 2025 10:39:31 +0000
Subject: [PATCH 02/19] Update 22b to 25a as the default image for ubuntu is
 now 24.04 for which there is no deps file available for 22b

---
 test/matlab/install_support_packages_as_container_user.sh | 8 ++++----
 test/matlab/scenarios.json                                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/matlab/install_support_packages_as_container_user.sh b/test/matlab/install_support_packages_as_container_user.sh
index 0a763e3..2de1a43 100644
--- a/test/matlab/install_support_packages_as_container_user.sh
+++ b/test/matlab/install_support_packages_as_container_user.sh
@@ -4,7 +4,7 @@
 #-------------------------------------------------------------------------------------------------------------
 #
 # This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with the R2022b release, and a support package installed.
+# includes the 'matlab' feature with the R2025a release, and a support package installed.
 # Support package installation is special, because these packages need to be installed into
 # the end users HOME folder and not into the root users folders. Installing into root will
 # result in users being unable to access the Support Packages.
@@ -24,7 +24,7 @@
 #         "installTools": false
 #     },
 #     "matlab": {
-#         "release": "R2022b",
+#         "release": "R2025a",
 #         "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
 #         "installMatlabEngineForPython": true
 #     }
@@ -50,10 +50,10 @@ source dev-container-features-test-lib
 # check <LABEL> <cmd> [args...]
 
 # Verify that the right release is installed in the expected location.
-check "R2022b is installed" bash -c "cat /opt/matlab/R2022b/VersionInfo.xml | grep '<release>R2022b</release>'"
+check "R2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
 
 # Verify MATLAB_Support_Package_for_Android_Sensors is installed at the right place (ie: The home folder for the containerUser : vscode )
-check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2022b/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
+check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025a/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
 
 check "python3 is installed " bash -c "python3 --version"
 
diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index 74aeb13..5f94c3a 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -31,7 +31,7 @@
                 "installTools": false
             },
             "matlab": {
-                "release": "r2022b",
+                "release": "r2025a",
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
                 "installMatlabEngineForPython": true
             }

From 1926b1b312cad3c6782a089f9474639086cdbbde Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 27 Jun 2025 12:07:04 +0000
Subject: [PATCH 03/19] use pip install --break-system-packages

---
 src/matlab/install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 712d6f2..324a2e2 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -65,7 +65,7 @@ function install_python_and_pip() {
         ihf_remove_packages "python3-requests"
     fi
     ihf_install_packages "python3 python3-pip" && \
-    python3 -m pip install --upgrade pip
+    python3 -m pip install --break-system-packages --upgrade pip
     
 }
 
@@ -79,13 +79,13 @@ function install_xvfb() {
 function install_matlab_proxy() {
     install_python_and_pip &&
     install_xvfb &&
-    python3 -m pip install --upgrade matlab-proxy
+    python3 -m pip install --break-system-packages --upgrade matlab-proxy
 }
 
 function install_jupyter_matlab_proxy() {
     install_python_and_pip &&
     install_xvfb &&
-    python3 -m pip install --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
+    python3 -m pip install --break-system-packages --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
 }
 
 function install_matlab_engine_for_python() {
@@ -108,7 +108,7 @@ function install_matlab_engine_for_python() {
     echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
 
     env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    python3 -m pip install matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+    python3 -m pip install --break-system-packages matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
 }
 
 # Create a home folder for non-root, undefined CONTAINER_USER, if not already available

From 1516554db78772abb47d8ab0082942646dfc1eb0 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 27 Jun 2025 12:30:42 +0000
Subject: [PATCH 04/19] change upgrade

---
 src/matlab/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 324a2e2..591e26d 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -65,7 +65,7 @@ function install_python_and_pip() {
         ihf_remove_packages "python3-requests"
     fi
     ihf_install_packages "python3 python3-pip" && \
-    python3 -m pip install --break-system-packages --upgrade pip
+    python3 -m pip install --upgrade pip
     
 }
 

From 1d9a9eb5c93eea0a6ebd1f42aa5408340ae2ff22 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 27 Jun 2025 18:24:48 +0000
Subject: [PATCH 05/19] pip upgrade also uses break-system-packages flag

---
 src/matlab/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 591e26d..324a2e2 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -65,7 +65,7 @@ function install_python_and_pip() {
         ihf_remove_packages "python3-requests"
     fi
     ihf_install_packages "python3 python3-pip" && \
-    python3 -m pip install --upgrade pip
+    python3 -m pip install --break-system-packages --upgrade pip
     
 }
 

From c45094a8a0dddd48dfb547501c99f5a97be98a45 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Thu, 24 Jul 2025 05:27:54 +0000
Subject: [PATCH 06/19] See .devcontainer/matlab for latest changes

---
 .devcontainer/basic/devcontainer.json         |  36 ++
 .../matlab-codespaces/devcontainer.json       |  68 ++++
 .../matlab/devcontainer-feature.json          | 115 ++++++
 .../matlab/install-helper-functions.sh        | 312 ++++++++++++++++
 .devcontainer/matlab/install-matlab-deps.sh   |  71 ++++
 .../matlab/install-python-packages.sh         |  59 +++
 .devcontainer/matlab/install.sh               | 338 ++++++++++++++++++
 .devcontainer/matlab/scope.sh                 |  19 +
 .devcontainer/matlab/tests.sh                 |  25 ++
 src/matlab/TODO.md                            |  83 +++++
 src/matlab/install-python-packages.sh         |  59 +++
 src/matlab/install.sh                         |  41 +--
 12 files changed, 1206 insertions(+), 20 deletions(-)
 create mode 100644 .devcontainer/basic/devcontainer.json
 create mode 100644 .devcontainer/matlab-codespaces/devcontainer.json
 create mode 100644 .devcontainer/matlab/devcontainer-feature.json
 create mode 100755 .devcontainer/matlab/install-helper-functions.sh
 create mode 100755 .devcontainer/matlab/install-matlab-deps.sh
 create mode 100644 .devcontainer/matlab/install-python-packages.sh
 create mode 100755 .devcontainer/matlab/install.sh
 create mode 100755 .devcontainer/matlab/scope.sh
 create mode 100755 .devcontainer/matlab/tests.sh
 create mode 100644 src/matlab/TODO.md
 create mode 100644 src/matlab/install-python-packages.sh

diff --git a/.devcontainer/basic/devcontainer.json b/.devcontainer/basic/devcontainer.json
new file mode 100644
index 0000000..3ad0842
--- /dev/null
+++ b/.devcontainer/basic/devcontainer.json
@@ -0,0 +1,36 @@
+{
+    // "image": "ubuntu:24.04",
+    // "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    // "remoteUser": "vscode",
+    "image": "mathworks/matlab:r2025a",
+    "containerUser": "matlab",
+    "features": {
+        "../matlab": {
+            "release": "r2025a",
+            "skipMATLABInstall": true,
+            "installMatlabProxy": true,
+            "installJupyterMatlabProxy": true,
+            "installMatlabEngineForPython": true
+        }
+    },
+    // Configure VSCode Extensions
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "MathWorks.language-matlab",
+                "ms-toolsai.jupyter",
+                "ms-python.python"
+            ],
+            "settings": {
+                "MATLAB.signIn": true,
+                "python.venvPath": "/opt/pipx/venvs/",
+                // Marks MATLAB Kernel as a trusted source
+                "jupyter.kernels.trusted": [
+                    // "/usr/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json",
+                    "opt/pipx/venvs/matlab-proxy/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json"
+                ]
+            }
+        }
+    },
+    "onCreateCommand": "echo =IAMUSER===$(whoami)===="
+}
\ No newline at end of file
diff --git a/.devcontainer/matlab-codespaces/devcontainer.json b/.devcontainer/matlab-codespaces/devcontainer.json
new file mode 100644
index 0000000..71361b8
--- /dev/null
+++ b/.devcontainer/matlab-codespaces/devcontainer.json
@@ -0,0 +1,68 @@
+{
+  /* This DevContainer configuration demonstrates
+      1. Building image using Dev Container Features
+      2. Installation of MATLAB Integration for Jupyter & JupyterLab  
+      3. Configuration of VSCode environment for following modes of access:
+          a. MATLAB in a Browser
+          b. Directly from VSCode, using the MATLAB extension for VSCode
+          c. Using Jupyter Notebooks in VSCode
+          d. Start Codespace in Jupyter
+  See: https://containers.dev/implementors/features/
+  */
+  "name": "Built using Dev Container Features",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    // "ghcr.io/mathworks/devcontainer-features/matlab": {
+    "../matlab": {
+      // For more options, See: https://github.com/mathworks/devcontainer-features/tree/main/src/matlab
+      "release": "r2025a",
+      "products": "MATLAB Symbolic_Math_Toolbox",
+      "installMatlabProxy": "true",
+      "startInDesktop": "true",
+      "installJupyterMatlabProxy": "true",
+      "installMatlabEngineForPython": "true"
+    }
+    // "ghcr.io/devcontainers/features/python": {
+    //   "version": "os-provided",
+    //   "installJupyterlab": true,
+    //   "configureJupyterlabAllowOrigin": "*"
+    // }
+  },
+  "portsAttributes": {
+    "8888": {
+      "label": "MATLAB",
+      "onAutoForward": "openPreview"
+    }
+  },
+  "containerEnv": {
+    "MWI_APP_PORT": "8888",
+    "MWI_ENABLE_TOKEN_AUTH": "False",
+    // Configure MATLAB's startup folder
+    "MATLAB_USERWORKDIR": "${containerWorkspaceFolder}",
+    "MATLAB_USE_USERWORK": "1",
+    // Enable embedding the desktop into VSCode's Simple Browser
+    "MWI_CUSTOM_HTTP_HEADERS": "{\"Content-Security-Policy\": \"frame-ancestors *\"}"
+  },
+  // Configure VSCode Extensions
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "MathWorks.language-matlab",
+        "ms-toolsai.jupyter",
+        "ms-python.python"
+      ],
+      "settings": {
+        "MATLAB.signIn": true,
+        // Marks MATLAB Kernel as a trusted source
+        "jupyter.kernels.trusted": [
+          "/usr/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json"
+        ]
+      }
+    }
+  },
+  // "hostRequirements": {
+  //   "cpus": 4
+  // },
+  // Need to specify a user to use the startInDesktop feature.
+  "containerUser": "vscode"
+}
\ No newline at end of file
diff --git a/.devcontainer/matlab/devcontainer-feature.json b/.devcontainer/matlab/devcontainer-feature.json
new file mode 100644
index 0000000..3ab16f0
--- /dev/null
+++ b/.devcontainer/matlab/devcontainer-feature.json
@@ -0,0 +1,115 @@
+{
+    "name": "MATLAB",
+    "id": "matlab",
+    "version": "0.3.0",
+    "description": "Installs MATLAB with supporting packages and tools.",
+    "documentationURL": "https://github.com/mathworks/devcontainer-features",
+    "options": {
+        "release": {
+            "type": "string",
+            "proposals": [
+                "R2025a",
+                "R2024b",
+                "R2024a",
+                "R2023b",
+                "R2023a",
+                "R2022b",
+                "R2022a",
+                "R2021b",
+                "R2021a",
+                "R2020b",
+                "R2020a",
+                "R2019b",
+                "R2019a"
+            ],
+            "default": "R2025a",
+            "description": "MATLAB Release to install."
+        },
+        "products": {
+            "type": "string",
+            "proposals": [
+                "MATLAB",
+                "MATLAB Simulink Signal_Processing_Toolbox"
+            ],
+            "default": "MATLAB",
+            "description": "Products to install, specified as a list of space-separated product names.</br> For details of products, see [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md#product-installation-options)."
+        },
+        "doc": {
+            "type": "boolean",
+            "default": false,
+            "description": "Flag to install documentation and examples (R2022b and earlier releases)."
+        },
+        "installGpu": {
+            "type": "boolean",
+            "default": false,
+            "description": "Skips installation of GPU libraries when you install Parallel Computing Toolbox (R2023a and later releases)."
+        },
+        "destination": {
+            "type": "string",
+            "default": "",
+            "description": "Full path to the installation destination folder. Default: /opt/matlab/${RELEASE^}"
+        },
+        "installMatlabProxy": {
+            "default": false,
+            "description": "Installs matlab-proxy and its dependencies (R2020b and later releases).",
+            "type": "boolean"
+        },
+        "installJupyterMatlabProxy": {
+            "default": false,
+            "description": "Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases).",
+            "type": "boolean"
+        },
+        "installMatlabEngineForPython": {
+            "default": false,
+            "description": "Installs the MATLAB Engine for Python if the destination option is set correctly.",
+            "type": "boolean"
+        },
+        "startInDesktop": {
+            "default": "false",
+            "description": "Starts matlab-proxy when container starts.",
+            "type": "string",
+            "enum": [
+                "true",
+                "false",
+                "test"
+            ]
+        },
+        "networkLicenseManager": {
+            "type": "string",
+            "proposals": [
+                "port@hostname"
+            ],
+            "default": "",
+            "description": "MATLAB will use the specified Network License Manager."
+        },
+        "skipMATLABInstall": {
+            "type": "boolean",
+            "default": false,
+            "description": "Set to true if you do not want to install MATLAB, for example if you only want to install `matlab-proxy` or `jupyter-matlab-proxy`."
+        },
+        "addContainerUserToDevGroup":{
+            "type": "string",
+            "default": "",
+            "description": "Enter the name of the containerUser that should be given access to the mounted folder. When containerUserName is provided, a group is created and the provided username is added to that group. The onCreateCommand Lifecycle hook then sets the permissions for that user to Read/Write/Execute from the mounted workspace folders."
+        }
+    },
+    // "onCreateCommand": "bash ?",
+    "postStartCommand": "( ls ~/.startmatlabdesktop >> /dev/null 2>&1 && env MWI_APP_PORT=8888 matlab-proxy-app 2>/dev/null ) || echo 'Will not start matlab-proxy-app...'",
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "MathWorks.language-matlab"
+            ],
+            "settings": {
+                "MATLAB.indexWorkspace": true,
+                "MATLAB.installPath": "/usr/local/bin/matlab",
+                "MATLAB.matlabConnectionTiming": "never",
+                "MATLAB.telemetry": true
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils",
+        "ghcr.io/devcontainers/features/python"
+    ]
+}
\ No newline at end of file
diff --git a/.devcontainer/matlab/install-helper-functions.sh b/.devcontainer/matlab/install-helper-functions.sh
new file mode 100755
index 0000000..5a35e89
--- /dev/null
+++ b/.devcontainer/matlab/install-helper-functions.sh
@@ -0,0 +1,312 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright 2024 The MathWorks, Inc.
+#-------------------------------------------------------------------------------------------------------------
+# Helpers functions to encapsulate OS specific installation
+
+set -eu -o pipefail
+
+# Global variable to store the last error message.
+LAST_ERR=""
+
+function _ihf_print_installation_status_on_exit() {
+    if [ $? -eq 0 ]; then
+        printf "Done!\n"
+    else
+        printf "$LAST_ERR \nFailed to install for MATLAB ${MATLAB_RELEASE:-undefined} on ${PRETTY_NAME:-undefined}.\nTo debug, call script with SHELLOPTS=xtrace \n"
+    fi
+}
+
+trap _ihf_print_installation_status_on_exit EXIT
+
+function ihf_print_and_exit() {
+    LAST_ERR="$1"
+    printf "$LAST_ERR, exiting...\n"
+    exit 1
+}
+
+function ihf_get_matlab_deps_os() {
+    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
+    local MATLAB_DEPS_OS_VERSION="undefined"
+    # get os-release variables
+    . /etc/os-release
+    
+    case ${LINUX_DISTRO} in
+        debian)
+            if [[ "${ID}" == "ubuntu" ]]; then
+                local SUPPORTED_VERSION_CODENAME="focal jammy"
+                MATLAB_DEPS_OS_VERSION=${ID}${VERSION_ID}
+                elif [[ "${ID}" == "debian" ]]; then
+                local SUPPORTED_VERSION_CODENAME="bullseye bookworm"
+                local UBUNTU_VERSION_ID=${VERSION_ID/11/20.04}
+                UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/12/22.04}
+                MATLAB_DEPS_OS_VERSION=ubuntu${UBUNTU_VERSION_ID}
+            fi
+        ;;
+        rhel)
+            if [[ "${ID}" == "rhel" ]]; then
+                # This link lists the Fedora base image that a particular RHEL version depends on:
+                # https://docs.fedoraproject.org/en-US/quick-docs/fedora-and-red-hat-enterprise-linux/
+                # UBI 9 -> Fedora 34
+                # UBI 8 -> Fedora 28
+                # The End of life for these distributions can be found here:
+                # https://endoflife.date/rhel
+                # https://endoflife.date/fedora
+                local SUPPORTED_MAJOR_VERSION="8 9"
+                local MATLAB_DEPS_OS_VERSION="ubi"
+                local MAJOR_VERSION_ID=$(echo $VERSION_ID | cut -d '.' -f 1)
+                local MAJOR_VERSION_ID_REGEX="\<${MAJOR_VERSION_ID}\>"
+                if [[ ${SUPPORTED_MAJOR_VERSION[@]} =~ ${MAJOR_VERSION_ID_REGEX} ]]; then
+                    MATLAB_DEPS_OS_VERSION=${MATLAB_DEPS_OS_VERSION}${MAJOR_VERSION_ID}
+                else
+                    ihf_print_and_exit "Un-supported version ${MAJOR_VERSION_ID}"
+                fi
+                
+                elif [[ "${ID}" == "fedora" ]]; then
+                # Assuming UBI 9 as fedora 28 was at end of life in 2018.
+                MATLAB_DEPS_OS_VERSION="ubi9"
+            else
+                ihf_print_and_exit "Unsupported OS ${ID}"
+            fi
+        ;;
+    esac
+    
+    #return value
+    echo $MATLAB_DEPS_OS_VERSION
+    
+}
+
+function _ihf_get_additional_repos (){
+    . /etc/os-release
+    
+    local _DISTRO=$(ihf_is_debian_or_rhel)
+    # To find some devel packages, some rhel need to enable specific extra repos, but not on RedHat ubi images...
+    local INSTALL_CMD_ADDL_REPOS=""
+    if [ ${_DISTRO} = "rhel" ] && [ ${ID} != "rhel" ]; then
+        local MAJOR_VERSION_ID=$(echo $VERSION_ID | cut -d '.' -f 1)
+        if [ ${MAJOR_VERSION_ID} = "8" ]; then
+            INSTALL_CMD_ADDL_REPOS="--enablerepo powertools"
+            elif [ ${MAJOR_VERSION_ID} = "9" ]; then
+            INSTALL_CMD_ADDL_REPOS="--enablerepo crb"
+        fi
+    fi
+    
+    echo $INSTALL_CMD_ADDL_REPOS
+}
+
+
+function ihf_get_pkg_mgr_cmd() {
+    local PKG_MGR_CMD=""
+    if type apt-get >/dev/null 2>&1; then
+        PKG_MGR_CMD=apt-get
+        elif type microdnf >/dev/null 2>&1; then
+        PKG_MGR_CMD=microdnf
+        elif type dnf >/dev/null 2>&1; then
+        PKG_MGR_CMD=dnf
+    else
+        PKG_MGR_CMD=yum
+    fi
+    
+    echo $PKG_MGR_CMD
+}
+
+function ihf_get_install_cmd() {
+    local PKG_MGR_CMD=$(ihf_get_pkg_mgr_cmd)
+    local INSTALL_CMD=""
+    if type apt-get >/dev/null 2>&1; then
+        INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
+        elif type microdnf >/dev/null 2>&1; then
+        INSTALL_CMD="${PKG_MGR_CMD} $(_ihf_get_additional_repos) -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+        elif type dnf >/dev/null 2>&1; then
+        INSTALL_CMD="${PKG_MGR_CMD} $(_ihf_get_additional_repos) -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+    else
+        INSTALL_CMD="${PKG_MGR_CMD} $(_ihf_get_additional_repos) -y install --disableplugin=subscription-manager --noplugins --setopt=install_weak_deps=0"
+    fi
+    
+    echo $INSTALL_CMD
+}
+
+function ihf_get_remove_cmd() {
+    local PKG_MGR_CMD=$(ihf_get_pkg_mgr_cmd)
+    local REMOVE_CMD="${PKG_MGR_CMD} -y remove"
+    
+    echo $REMOVE_CMD
+}
+
+# returns "true/false" string if MATLAB_RELEASE is valid
+function ihf_is_valid_matlab_release() {
+    # List of supported MATLAB_RELEASE values
+    local _SUPPORTED_MATLAB_RELEASES=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
+    
+    ## Validate MATLAB_RELEASE
+    if [ -z "$MATLAB_RELEASE" ]; then
+        echo "false"
+    else
+        # checking if valid matlab release configuration
+        local _RELEASE_REGEX="\<${MATLAB_RELEASE}\>"
+        if [[ ${_SUPPORTED_MATLAB_RELEASES[@]} =~ ${_RELEASE_REGEX} ]]; then
+            echo "true"
+        else
+            echo "false"
+        fi
+    fi
+}
+
+function ihf_is_debian_or_rhel() {
+    . /etc/os-release
+    
+    if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+        echo "debian"
+        elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+        echo "rhel"
+    else
+        ihf_print_and_exit "Linux distro ${ID} not supported."
+    fi
+}
+
+function ihf_clean_up() {
+    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
+    case ${LINUX_DISTRO} in
+        debian)
+            rm -rf /var/lib/apt/lists/*
+            apt-get clean && apt-get autoremove
+        ;;
+        rhel)
+            rm -rf /var/cache/dnf/* /var/cache/yum/*
+            rm -rf /tmp/yum.log
+            yum --disableplugin=subscription-manager clean all -y
+        ;;
+    esac
+}
+
+ihf_updaterc() {
+    local _bashrc
+    local _zshrc
+    if [ "${UPDATE_RC}" = "true" ]; then
+        case $ADJUSTED_ID in
+            debian)
+                echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
+                _bashrc=/etc/bash.bashrc
+                _zshrc=/etc/zsh/zshrc
+            ;;
+            rhel)
+                echo "Updating /etc/bashrc and /etc/zshrc..."
+                _bashrc=/etc/bashrc
+                _zshrc=/etc/zshrc
+            ;;
+        esac
+        if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
+            echo -e "$1" >>${_bashrc}
+        fi
+        if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
+            echo -e "$1" >>${_zshrc}
+        fi
+    fi
+}
+
+function ihf_pkg_mgr_update() {
+    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
+    local PKG_MGR_CMD=$(ihf_get_pkg_mgr_cmd)
+    echo "UPDATING using $PKG_MGR_CMD"
+    case $LINUX_DISTRO in
+        debian)
+            echo "Running apt-get update..."
+            ${PKG_MGR_CMD} update -y
+        ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                    ${PKG_MGR_CMD} check-update
+                    rc=$?
+                    if [ $rc != 0 ] && [ $rc != 100 ]; then
+                        exit 1
+                    fi
+                    set -e
+                fi
+            fi
+        ;;
+    esac
+}
+
+# Checks if packages are installed and installs them if not
+function ihf_install_packages() {
+    
+    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
+    local INSTALL_CMD=$(ihf_get_install_cmd)
+    echo "install command: $INSTALL_CMD"
+    echo "INSTALLING $@"
+    case ${LINUX_DISTRO} in
+        debian)
+            if ! dpkg -s "$@" >/dev/null 2>&1; then
+                ihf_pkg_mgr_update && \
+                ${INSTALL_CMD} $@
+            fi
+        ;;
+        rhel)
+            if ! rpm -q "$@" >/dev/null 2>&1; then
+                ihf_pkg_mgr_update
+                ${INSTALL_CMD} $@
+            fi
+        ;;
+    esac
+}
+
+function ihf_remove_packages() {
+    
+    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
+    local REMOVE_CMD=$(ihf_get_remove_cmd)
+    echo "remove command: $REMOVE_CMD"
+    echo "REMOVING: $@"
+    case ${LINUX_DISTRO} in
+        debian)
+            if dpkg -s "$@" >/dev/null 2>&1; then
+                ${REMOVE_CMD} $@
+            fi
+        ;;
+        rhel)
+            if rpm -q "$@" >/dev/null 2>&1; then
+                ${REMOVE_CMD} $@
+            fi
+        ;;
+    esac
+}
+
+function test_script() {
+    # Only run tests if this script is called directly
+    # These will not run if this script is sourced from another file
+    if [ $(basename "$0") == "install-helper-functions.sh" ]; then
+        echo "=============Starting test"
+        echo "me=$(basename "$0")"
+        
+        echo "testing update"
+        ihf_pkg_mgr_update
+        
+        
+        MATLAB_RELEASE=R2024a
+        is_release_valid=$(ihf_is_valid_matlab_release)
+        echo "Is $MATLAB_RELEASE valid? Ans: $is_release_valid"
+        
+        MATLAB_RELEASE=R2023bd
+        echo "Is $MATLAB_RELEASE valid? Ans: $(ihf_is_valid_matlab_release)"
+        
+        LINUX_DISTRO=$(ihf_is_debian_or_rhel)
+        echo "LINUX_DISTRO: $LINUX_DISTRO"
+        
+        matlab_deps_os=$(ihf_get_matlab_deps_os)
+        echo "The MATLAB deps to install is: $matlab_deps_os"
+        
+        install_cmd=$(ihf_get_install_cmd)
+        echo "install_cmd: $install_cmd"
+        
+        echo "Finished test=============="
+    fi
+}
+
+test_script
diff --git a/.devcontainer/matlab/install-matlab-deps.sh b/.devcontainer/matlab/install-matlab-deps.sh
new file mode 100755
index 0000000..2b75be8
--- /dev/null
+++ b/.devcontainer/matlab/install-matlab-deps.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+# This script install the OS dependencies required by MATLAB for the release specified in the
+# environment variable MATLAB_RELEASE on any linux OS that is dervied from Ubuntu or RHEL
+#-------------------------------------------------------------------------------------------------------------
+# Copyright 2024 The MathWorks, Inc.
+#-------------------------------------------------------------------------------------------------------------
+
+set -eu -o pipefail
+# exits on an error (-e, equivalent to -o errexit);
+# exits on an undefined variable (-u, equivalent to -o nounset);
+# exits on an error in piped-together commands (-o pipefail)
+
+# Uncomment to debug:
+# set -x
+# Or, set environment variable "SHELLOPTS=xtrace" before starting script
+
+if [ $(basename "$0") != "install-matlab-deps.sh" ]; then
+    _SCRIPT_LOCATION="$1"
+    source ${_SCRIPT_LOCATION}/install-helper-functions.sh
+else
+    source $(dirname "$0")/install-helper-functions.sh
+fi
+
+
+# Verify if valid MATLAB_RELEASE
+if [ "$(ihf_is_valid_matlab_release)" == "false" ]; then
+    ihf_print_and_exit "Invalid or Unsupported MATLAB_RELEASE: $MATLAB_RELEASE "
+fi
+
+function print_os_info(){
+    . /etc/os-release
+    echo "Running install-matlab-deps script on: $PRETTY_NAME"
+    echo "ID=$ID , VERSION_ID=$VERSION_ID, for MATLAB_RELEASE=$MATLAB_RELEASE"
+}
+
+function get_prerequisite_pkgs() {
+    # Returns the list of pre-requisite packages required to install matlab-deps
+    echo "wget unzip ca-certificates"
+}
+
+function get_base_dependencies_list() {
+    local MATLAB_DEPS_OS_VERSION=$(ihf_get_matlab_deps_os)
+    local BASE_DEPS_URL=https://raw.githubusercontent.com/mathworks-ref-arch/container-images/main/matlab-deps/${MATLAB_RELEASE,}/${MATLAB_DEPS_OS_VERSION}/base-dependencies.txt
+    # Get matlab_deps - if this fails, then we aren't on a supported os
+    local PKGS=$(wget -qO- ${BASE_DEPS_URL})
+    if [ -z "$PKGS" ]; then
+        ihf_print_and_exit "${MATLAB_DEPS_OS_VERSION} is not a supported OS for MATLAB ${MATLAB_RELEASE} ."
+    fi
+    echo $PKGS
+}
+
+function install_matlab_deps() {
+    local MATLAB_DEPS_OS_VERSION=$(ihf_get_matlab_deps_os)
+    # local linux_distro=$(ihf_is_debian_or_rhel)
+    
+    print_os_info
+    
+    local PREREQ_PACKAGES=$(get_prerequisite_pkgs)
+    
+    ihf_install_packages "$PREREQ_PACKAGES"
+    
+    echo "Get list of dependencies from ${MATLAB_RELEASE}/${MATLAB_DEPS_OS_VERSION}/base-dependencies.txt"
+    local BASE_DEPS_PKGS=$(get_base_dependencies_list)
+    ihf_install_packages "$BASE_DEPS_PKGS"
+    
+    ihf_clean_up
+    # Return 0 to indicate success!
+    return 0
+}
+install_matlab_deps
+
diff --git a/.devcontainer/matlab/install-python-packages.sh b/.devcontainer/matlab/install-python-packages.sh
new file mode 100644
index 0000000..c090f3a
--- /dev/null
+++ b/.devcontainer/matlab/install-python-packages.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright 2025 The MathWorks, Inc.
+#-------------------------------------------------------------------------------------------------------------
+# NOTE: The 'install-python-package.sh' uses PIPX to install python packages into an environment known
+
+set -eu -o pipefail
+
+function install_python_and_pip() {
+    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
+        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
+        ihf_remove_packages "python3-requests"
+    fi
+    ihf_install_packages "python3 python3-pip" && \
+    python3 -m pip install --upgrade pip
+    
+}
+
+function install_xvfb() {
+    if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
+        # Xvfb is unavailable in RHEL systems
+        ihf_install_packages "xvfb"
+    fi
+}
+
+function install_matlab_proxy() {
+    install_python_and_pip &&
+    install_xvfb &&
+    python3 -m pip install --upgrade matlab-proxy
+}
+
+function install_jupyter_matlab_proxy() {
+    install_python_and_pip &&
+    install_xvfb &&
+    python3 -m pip install --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
+}
+
+function install_matlab_engine_for_python() {
+    # Installing the engine is tricky
+    # The installation can fail if the python version does not match the supported release
+    declare -A matlabengine_map
+    matlabengine_map['R2025a']="25.1"
+    matlabengine_map['R2024b']="24.2"
+    matlabengine_map['R2024a']="24.1"
+    matlabengine_map['R2023b']="23.2"
+    matlabengine_map['R2023a']="9.14"
+    matlabengine_map['R2022b']="9.13"
+    matlabengine_map['R2022a']="9.12"
+    matlabengine_map['R2021b']="9.11"
+    matlabengine_map['R2021a']="9.10"
+    matlabengine_map['R2020b']="9.9"
+    
+    install_python_and_pip &&
+    
+    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
+
+    env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
+    python3 -m pip install  matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+}
\ No newline at end of file
diff --git a/.devcontainer/matlab/install.sh b/.devcontainer/matlab/install.sh
new file mode 100755
index 0000000..96d1a70
--- /dev/null
+++ b/.devcontainer/matlab/install.sh
@@ -0,0 +1,338 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright 2024-2025 The MathWorks, Inc.
+#-------------------------------------------------------------------------------------------------------------
+# NOTE: The 'install.sh' entrypoint script is always executed as the root user.
+
+set -eu -o pipefail
+# exits on an error (-e, equivalent to -o errexit);
+# exits on an undefined variable (-u, equivalent to -o nounset);
+# exits on an error in piped-together commands (-o pipefail)
+
+# Uncomment to debug:
+# set -x
+# Or, set environment variable "SHELLOPTS=xtrace" before starting script
+
+### Variable Declaration Begin ###
+
+## Set defaults to all the options in the feature.
+
+# R2025a is the latest available release.
+RELEASE="${RELEASE:-"R2025a"}"
+PRODUCTS="${PRODUCTS:-"MATLAB"}"
+DOC="${DOC:-"false"}"
+INSTALLGPU="${INSTALLGPU:-"false"}"
+DESTINATION="${DESTINATION:-"/opt/matlab/${RELEASE^}"}"
+INSTALLMATLABPROXY="${INSTALLMATLABPROXY:-"false"}"
+INSTALLJUPYTERMATLABPROXY="${INSTALLJUPYTERMATLABPROXY:-"false"}"
+INSTALLMATLABENGINEFORPYTHON="${INSTALLMATLABENGINEFORPYTHON:-"false"}"
+STARTINDESKTOP="${STARTINDESKTOP:-"false"}"
+NETWORKLICENSEMANAGER="${NETWORKLICENSEMANAGER:-" "}"
+SKIPMATLABINSTALL="${SKIPMATLABINSTALL:-"false"}"
+
+MATLAB_RELEASE="${RELEASE^}"
+MATLAB_PRODUCT_LIST="${PRODUCTS}"
+MATLAB_INSTALL_LOCATION="${DESTINATION}"
+
+echo "MATLAB_INSTALL_LOCATION: ${MATLAB_INSTALL_LOCATION}"
+
+# Needed by the MATLAB Engine for Python.
+# Appends to any existing value of LD_LIBRARY_PATH the path where MATLAB is installed by this script.
+_LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"${LD_LIBRARY_PATH}:"}${MATLAB_INSTALL_LOCATION}/bin/glnxa64"
+
+_CONTAINER_USER_HOME="${_CONTAINER_USER_HOME:-"undefined"}"
+_CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
+
+_SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
+
+# PIPX settings, which be replaced with the --global flag once pipx versions >1.5 are available from APT
+# _PIPX_HOME=/opt/pipx
+# _PIPX_BIN_DIR=/usr/local/bin
+# _PIPX_MAN_DIR=/usr/local/share/man
+# _PIPX_INSTALL="env PIPX_HOME=${_PIPX_HOME} PIPX_BIN_DIR=${_PIPX_BIN_DIR} PIPX_MAN_DIR=${_PIPX_MAN_DIR} pipx install"
+_PIPX_UNINSTALL="pipx uninstall"
+_PIPX_INSTALL="pipx install --global"
+_PIPX_INJECT="pipx inject"
+
+### Variable Declaration End ###
+### Helper Functions Begin ###
+export DEBIAN_FRONTEND=noninteractive
+
+function updaterc() {
+    echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
+    if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
+        echo -e "$1" >>/etc/bash.bashrc
+    fi
+    if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
+        echo -e "$1" >>/etc/zsh/zshrc
+    fi
+}
+
+function install_xvfb() {
+    if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
+        # Xvfb is unavailable in RHEL systems
+        ihf_install_packages "xvfb"
+    fi
+}
+
+function install_python_and_pip() {
+    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
+        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
+        ihf_remove_packages "python3-requests"
+    fi
+    ihf_install_packages "python3 python3-pip"
+}
+
+function install_pipx() {
+    ## The OS version of PIPX is old.
+    # ihf_install_packages "pipx"
+
+    # Cannot install PIPX in the presence of pipx installed by system
+    ihf_remove_packages "pipx"
+
+    # Then install PIPX through the PyPI to get the latest version of PIPX
+    python3 -m pip install --break-system-packages pipx
+
+    pipx ensurepath --prepend
+}
+
+
+# matlab-proxy is the pipx environment into which MW packages will be installed 
+_MATLAB_PROXY_HAS_BEEN_INSTALLED=0
+function install_matlab_proxy() {
+    if [ "$_MATLAB_PROXY_HAS_BEEN_INSTALLED" -eq 0 ]; then 
+        install_xvfb
+
+        ## Remove old references to matlab-proxy
+        # can't remove references that have been placed on the PATH by MATLAB user
+        # $_PIPX_UNINSTALL matlab-proxy &&
+        $_PIPX_INSTALL matlab-proxy
+
+        # Fresh Install  
+        # Ensure that PIPX places installed applications on top of the PATH
+        _MATLAB_PROXY_HAS_BEEN_INSTALLED=1
+    else
+        echo "MATLAB Proxy has been installed."
+    fi
+}
+
+function install_jupyter_matlab_proxy() {
+    install_matlab_proxy &&
+    # TODO: Think about how to inject into existing Jupyter environments.
+    # This will override other Jupyter environments.
+    $_PIPX_INJECT --include-apps --include-deps matlab-proxy jupyter-matlab-proxy jupyterlab jupyter 
+}
+
+function install_matlab_engine_for_python() {
+    # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
+    # See: https://mathworks.com/support/requirements/python-compatibility.html
+    declare -A matlabengine_map
+    matlabengine_map['R2025a']="25.1"
+    matlabengine_map['R2024b']="24.2"
+    matlabengine_map['R2024a']="24.1"
+    matlabengine_map['R2023b']="23.2"
+    matlabengine_map['R2023a']="9.14"
+    matlabengine_map['R2022b']="9.13"
+    matlabengine_map['R2022a']="9.12"
+    matlabengine_map['R2021b']="9.11"
+    matlabengine_map['R2021a']="9.10"
+    matlabengine_map['R2020b']="9.9"
+    
+    
+    install_matlab_proxy && \
+    env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
+    $_PIPX_INJECT matlab-proxy matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
+}
+
+# Create a home folder for non-root, undefined CONTAINER_USER, if not already available
+function create_home_folder_for_container_user() {
+    if [ ! -z "$_CONTAINER_USER" -a "$_CONTAINER_USER" != "undefined" ] && [ "$_CONTAINER_USER" != "root" ]; then
+        if [ "$_CONTAINER_USER_HOME" == "undefined" ] || [ -z "$_CONTAINER_USER_HOME"  ]; then
+            echo "Creating home directory for CONTAINER_USER"
+            
+            ORIG_UID=$(id -u $_CONTAINER_USER)
+            ORIG_GID=$(id -g $_CONTAINER_USER)
+            
+            # adduser is the preferred high level function to create a user.
+            # The "-m" flag is used to indicate the creation of the home folder.
+            # The "-M" flag is used to avoid the creation of the home folder.
+            ## We are recreating the CONTAINER_USER after deleting to avoid the "user already exists" error
+            adduser tempuser -M -u $(($ORIG_UID + 1)) -g $ORIG_GID && \
+            userdel $_CONTAINER_USER && \
+            adduser $_CONTAINER_USER -m -u $ORIG_UID -g $ORIG_GID && \
+            userdel tempuser
+            
+            # Set value to newly created home
+            _CONTAINER_USER_HOME=$(cat /etc/passwd | grep $_CONTAINER_USER | cut -d ':' -f 6)
+            
+            # Manual approach without using "adduser"
+            # mkdir /home/$_CONTAINER_USER && \
+            # cp -rT /etc/skel /home/ $_CONTAINER_USER && \
+            # chown -R ${_CONTAINER_USER}:${_CONTAINER_USER} /home/$_CONTAINER_USER
+            # _CONTAINER_USER_HOME="/home/$_CONTAINER_USER"
+            echo "New home directory: ${_CONTAINER_USER_HOME}"
+        fi
+    fi
+}
+
+# Include the helper functions: ihf_*
+source ${_SCRIPT_LOCATION}/install-helper-functions.sh
+
+### Helper Functions End ###
+### Script Section Begin ###
+
+## Handle all other options first before attempting to install MATLAB.
+
+# Verify if valid MATLAB_RELEASE
+if [ "$(ihf_is_valid_matlab_release)" == "false" ]; then
+    ihf_print_and_exit "Invalid or Unsupported MATLAB_RELEASE: $MATLAB_RELEASE "
+fi
+
+MATLAB_FEATURE_INSTALL_TMPDIR=/tmp/matlab-feature-install
+mkdir -p $MATLAB_FEATURE_INSTALL_TMPDIR && pushd $MATLAB_FEATURE_INSTALL_TMPDIR
+
+install_python_and_pip
+install_pipx
+
+# Install matlab-proxy if requested
+if [ "${INSTALLMATLABPROXY}" == "true" ]; then
+    echo "Installing matlab-proxy"
+    install_matlab_proxy
+fi
+
+# Install jupyter-matlab-proxy if requested
+if [ "${INSTALLJUPYTERMATLABPROXY}" == "true" ]; then
+    echo "Installing jupyter-matlab-proxy"
+    install_jupyter_matlab_proxy
+fi
+
+if [ "${STARTINDESKTOP}" == "true" ] || [ "${STARTINDESKTOP}" == "test" ]; then
+    echo "User wants to start in MATLAB Desktop."
+    # Leave a marker file that can be checked by the postStartCommand
+    # matlab-proxy will be started by the postStartCommand.
+    # Current postStartCommand:
+    # "( ls ~/.startmatlabdesktop >> /dev/null 2>&1 && env MWI_APP_PORT=8888 matlab-proxy-app 2>/dev/null ) || echo 'Will not start matlab-proxy-app...'",
+    # the /tmp directory is not available on codespaces, using _CONTAINER_USER_HOME instead.
+    
+    create_home_folder_for_container_user
+    
+    if [ ! -z "${_CONTAINER_USER_HOME}" -a "${_CONTAINER_USER_HOME}" != "undefined" ]; then
+        # This feature is only available when _CONTAINER_USER_HOME is known.
+        if [ "${STARTINDESKTOP}" == "true" ]; then
+            install_matlab_proxy &&
+            touch ${_CONTAINER_USER_HOME}/.startmatlabdesktop &&
+            chmod a+rw ${_CONTAINER_USER_HOME}/.startmatlabdesktop &&
+            rm -f ${_CONTAINER_USER_HOME}/.teststartmatlabdesktop
+        else
+            # This file is used during testing and does not actually effect the postStartCommand that is looking for
+            # the startmatlabdesktop file!
+            # Without this, Tests would hang indefinitely waiting for the postStartCommand
+            install_matlab_proxy &&
+            touch ${_CONTAINER_USER_HOME}/.teststartmatlabdesktop &&
+            chmod a+rw ${_CONTAINER_USER_HOME}/.teststartmatlabdesktop &&
+            rm -f ${_CONTAINER_USER_HOME}/.startmatlabdesktop
+        fi
+    else
+        echo "Cannot start in desktop as the _CONTAINER_USER_HOME is undefined or empty. Value:'${_CONTAINER_USER_HOME}'"
+    fi
+fi
+
+# Update RC files with the provided license manager info
+if [ ! -z "${NETWORKLICENSEMANAGER}" -a "${NETWORKLICENSEMANAGER}" != " " ]; then
+    updaterc "export MLM_LICENSE_FILE=${NETWORKLICENSEMANAGER}"
+fi
+
+if [ "$SKIPMATLABINSTALL" != 'true' ]; then
+    
+    ### MATLAB Installation Steps:
+    ## 1. Install OS Dependencies required by MATLAB
+    ## 2. Setup MPM flags based on options
+    ## 3. Install MATLAB using MPM
+    
+    ## 1. Install OS Dependencies required by MATLAB
+    source ${_SCRIPT_LOCATION}/install-matlab-deps.sh ${_SCRIPT_LOCATION}
+    
+    ## 2. Setup MPM flags based on options
+    ADDITIONAL_MPM_FLAGS=" "
+    
+    # Handle DOC installation
+    if [ "${DOC}" == "true" ]; then
+        ADDITIONAL_MPM_FLAGS="${ADDITIONAL_MPM_FLAGS} --doc "
+    fi
+    
+    # Handle GPU installation
+    if [ "${INSTALLGPU}" == "false" ]; then
+        RELEASES_THAT_SUPPORT_NOGPU=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a")
+        # The value variable is assigned a regex that matches the exact value
+        value="\<${MATLAB_RELEASE}\>"
+        if [[ ${RELEASES_THAT_SUPPORT_NOGPU[@]} =~ $value ]]; then
+            echo "'$MATLAB_RELEASE' supports NOGPU flag..."
+            ADDITIONAL_MPM_FLAGS="${ADDITIONAL_MPM_FLAGS} --no-gpu "
+        else
+            echo "'$MATLAB_RELEASE' does not support NOGPU flag, skipping..."
+        fi
+    fi
+    
+    echo "Container user is defined as : '$_CONTAINER_USER'"
+    echo "Container user's effective home dir: '$_CONTAINER_USER_HOME'"
+    echo "Remote user is defined as : '${_REMOTE_USER:-"undefined"}'"
+    echo "Remote user's effective home dir: '${_REMOTE_USER_HOME:-"undefined"}'"
+    
+    ## 3. Install MATLAB using MPM
+    if [ ! -z "$_CONTAINER_USER" -a "$_CONTAINER_USER" != "undefined" ] && [ "$_CONTAINER_USER" != "root" ]; then
+        # Use the containerUser option to set this value. The "vscode" user works well with tests.
+        # The "codespaces" user returns an empty _CONTAINER_USER_HOME
+        echo "Container user is defined as : '$_CONTAINER_USER'"
+        echo "Container user's effective home dir: '$_CONTAINER_USER_HOME'"
+        
+        create_home_folder_for_container_user
+        
+        echo "Proceeding to install matlab as '$_CONTAINER_USER'..."
+
+        echo "Install location for MATLAB: ${MATLAB_INSTALL_LOCATION}"
+        
+        # Switching to container user
+        su $_CONTAINER_USER
+        pushd $_CONTAINER_USER_HOME
+        
+        # Installing MATLAB as containerUser allows for support packages to be installed at the correct location.
+        wget -q https://www.mathworks.com/mpm/glnxa64/mpm &&
+        chmod +x mpm &&
+        sudo HOME=${_CONTAINER_USER_HOME} ./mpm install \
+        --release=${MATLAB_RELEASE} \
+        --destination=${MATLAB_INSTALL_LOCATION} \
+        --products ${MATLAB_PRODUCT_LIST} ${ADDITIONAL_MPM_FLAGS} &&
+        sudo rm -f mpm /tmp/mathworks_root.log &&
+        sudo ln -fs ${MATLAB_INSTALL_LOCATION}/bin/matlab /usr/local/bin/matlab
+        
+        ## Resetting to original context
+        # exit will reset the user to root and call popd
+        # exit
+        popd
+        sudo su
+    else
+        echo "Proceeding to install matlab as root user..."
+        # Installs as root, because feature scripts run as root user.
+        # Any support package installed here will not be accessible to non-root users of the system.
+        wget https://www.mathworks.com/mpm/glnxa64/mpm &&
+        chmod +x mpm &&
+        ./mpm install \
+        --release=${MATLAB_RELEASE} \
+        --destination=${MATLAB_INSTALL_LOCATION} \
+        --products ${MATLAB_PRODUCT_LIST} ${ADDITIONAL_MPM_FLAGS} &&
+        rm -f mpm /tmp/mathworks_root.log &&
+        ln -fs ${MATLAB_INSTALL_LOCATION}/bin/matlab /usr/local/bin/matlab
+    fi
+fi
+
+# MATLAB Engine for Python can only be installed if MATLAB is on the PATH
+if [ "${INSTALLMATLABENGINEFORPYTHON}" == "true" ]; then
+    echo "Installing matlabengine"
+    install_matlab_engine_for_python
+fi
+
+popd
+### Script Section End ###
+echo "MATLAB feature installation is complete."
+exit 0
diff --git a/.devcontainer/matlab/scope.sh b/.devcontainer/matlab/scope.sh
new file mode 100755
index 0000000..6d1aa68
--- /dev/null
+++ b/.devcontainer/matlab/scope.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+
+MATLAB_PROXY_INSTALL_COMPLETE=0
+
+
+function is_matlab_proxy_installation_complete() {
+    echo "state:$MATLAB_PROXY_INSTALL_COMPLETE"
+}
+
+function install_matlab_proxy() {
+    MATLAB_PROXY_INSTALL_COMPLETE=1
+}
+
+is_matlab_proxy_installation_complete
+install_matlab_proxy
+is_matlab_proxy_installation_complete
+
+
diff --git a/.devcontainer/matlab/tests.sh b/.devcontainer/matlab/tests.sh
new file mode 100755
index 0000000..47a3b1c
--- /dev/null
+++ b/.devcontainer/matlab/tests.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Calls conatins to test the install scripts
+
+# Check default installation for R2024b
+RELEASE=R2024b
+RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
+# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted ubuntu:20.04 -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
+
+RELEASE=R2022b
+RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
+# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
+
+RELEASE=R2024b
+RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
+# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+docker run -it --rm --entrypoint /usr/bin/bash -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest
+
+# RELEASE=R2024a
+# RUN_INSTALL_SCRIPT="sudo env INSTALLMATLABENGINEFORPYTHON=true SKIPMATLABINSTALL=true _CONTAINER_USER=matlab \
+# _CONTAINER_USER_HOME=/home/matlab DESTINATION=/opt/matlab/${RELEASE^} RELEASE=${RELEASE} \
+# ~/install/install.sh "
+# TEST_IF_MATLABENGINE_INSTALLED="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+# docker run -it --rm --entrypoint /bin/sh -v `pwd`/src/matlab/:/home/matlab/install mathworks/matlab:${RELEASE} -c "$RUN_INSTALL_SCRIPT && $TEST_IF_MATLABENGINE_INSTALLED"
\ No newline at end of file
diff --git a/src/matlab/TODO.md b/src/matlab/TODO.md
new file mode 100644
index 0000000..d318a1e
--- /dev/null
+++ b/src/matlab/TODO.md
@@ -0,0 +1,83 @@
+
+# How to install matlab-proxy, jupyter-matlab-proxy or the MATLAB Engine for python 3.12?
+
+- The base install.sh script will install PIPX.
+- The onCreateCommand lifecycle hook, can then call another script to install python packages using PIPX into a single environment.
+- The script will need to be placed into a location that the user can access later on!
+    - Assumptions:
+        * The script has access to the configuration in the JSON file, so that it knows which packages to install.
+        * The script is being run as the end user of the container, only then will the installations by PIPX be visible and on PATH for that user.
+        
+## How to do it?
+
+- Create a base environment, lets say matlab-proxy
+```bash
+pipx install matlab-proxy
+```
+- Then based on other feature requirements, install the others while including their installed apps
+```bash
+pipx inject --include-apps --include-deps matlab-proxy jupyterlab jupyter-matlab-proxy
+```
+
+using pipx would:
+1. Make sure that matlab-proxy-app, is on the path.
+2. However, generic python packages like matlabengine & jupyter-matlab-proxy will not be available to users
+
+What is the user expectation?
+* When the codespace/devcontainer uses the feature:
+    a. The environment is already configured with all the things he needs.
+
+* E1: He expects to have the python interpreter setup
+* E2: He expects to have matlabengine available for use with the python interpreter that is setup
+* E3: If Jupyterlab is available, then he expects to see the MATLAB Integration for Jupyter to show up
+* E4: He expects to have the matlab-proxy-app executable available to call
+
+Strategy 1: PIPX to install MP, JMP + Jupyter, ME into a single PIPX MATLAB VENV
+
+Expectations met: E4, E3, E2(only if he uses the notebook)
+Expectations failed: E1 & E2
+
+Strategy 2: Strategy 1 + Activate the PIPX MATLAB VENV
+
+NOTES:
+* PIPX is a tool to install command line utilities, and not meant for environment management.
+* Renaming of environments created using PIPX is directly supported. 
+    - one could rename the 
+
+
+# Attempt 1:
+Using the --global flag or equivalent option in PIPX along with ensureonpath as root user.
+This allows for the executables to be available for the logged in user.
+
+PIPX is anyways not meant to be a solution for extensibility of packages.
+
+## Behavior
+1. executables are found on path by end user.
+2. there may be shadowing of executables. ex: mathworks/matlab installs MPA, and that executable sits higher up on the path than the one installed by the devcontainer feature.
+3. 
+
+## To Check:
+See if the notebook can be used from vscode.
+
+## Issues found:
+1. mathworks/matlab:r2025a had issues with user privileges. The mounted repostiory files could not be used.
+    * There may be a way to get past this in the devcontainer configuration files.
+
+2. 
+
+## Discoveries
+1. MATLAB Engine for Python was able to render the login screens when using `-licmode onlinelicensing`
+   The environment was: A Devcontainer running WSL2 on Windows  
+# Thoughts
+
+## what are the goals of the devcontainer feature.
+* Make it easy to install MATLAB into devcontainers
+* Make it easier to use MATLAB in the containerized environment
+
+* What are the ways in which people use MATLAB:
+ 1. command line
+ 2. VSCode editor run and edit
+ 3. Jupyter notebooks in vscode.
+ 4. Jupyter executable
+ 5. Desktop MATLAB 
+ 6. 
diff --git a/src/matlab/install-python-packages.sh b/src/matlab/install-python-packages.sh
new file mode 100644
index 0000000..c090f3a
--- /dev/null
+++ b/src/matlab/install-python-packages.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright 2025 The MathWorks, Inc.
+#-------------------------------------------------------------------------------------------------------------
+# NOTE: The 'install-python-package.sh' uses PIPX to install python packages into an environment known
+
+set -eu -o pipefail
+
+function install_python_and_pip() {
+    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
+        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
+        ihf_remove_packages "python3-requests"
+    fi
+    ihf_install_packages "python3 python3-pip" && \
+    python3 -m pip install --upgrade pip
+    
+}
+
+function install_xvfb() {
+    if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
+        # Xvfb is unavailable in RHEL systems
+        ihf_install_packages "xvfb"
+    fi
+}
+
+function install_matlab_proxy() {
+    install_python_and_pip &&
+    install_xvfb &&
+    python3 -m pip install --upgrade matlab-proxy
+}
+
+function install_jupyter_matlab_proxy() {
+    install_python_and_pip &&
+    install_xvfb &&
+    python3 -m pip install --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
+}
+
+function install_matlab_engine_for_python() {
+    # Installing the engine is tricky
+    # The installation can fail if the python version does not match the supported release
+    declare -A matlabengine_map
+    matlabengine_map['R2025a']="25.1"
+    matlabengine_map['R2024b']="24.2"
+    matlabengine_map['R2024a']="24.1"
+    matlabengine_map['R2023b']="23.2"
+    matlabengine_map['R2023a']="9.14"
+    matlabengine_map['R2022b']="9.13"
+    matlabengine_map['R2022a']="9.12"
+    matlabengine_map['R2021b']="9.11"
+    matlabengine_map['R2021a']="9.10"
+    matlabengine_map['R2020b']="9.9"
+    
+    install_python_and_pip &&
+    
+    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
+
+    env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
+    python3 -m pip install  matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+}
\ No newline at end of file
diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 324a2e2..778ed0c 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 #-------------------------------------------------------------------------------------------------------------
 # NOTE: The 'install.sh' entrypoint script is always executed as the root user.
 
@@ -45,6 +45,12 @@ _CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
 
 _SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
 
+# PIPX settings, which be replaced with the --global flag once pipx versions >1.5 are available from APT
+_PIPX_HOME=/opt/pipx
+_PIPX_BIN_DIR=/usr/local/bin
+_PIPX_MAN_DIR=/usr/local/share/man
+_PIPX_CMD="env PIPX_HOME=${_PIPX_HOME} PIPX_BIN_DIR=${_PIPX_BIN_DIR} PIPX_MAN_DIR=${_PIPX_MAN_DIR} pipx"
+
 ### Variable Declaration End ###
 ### Helper Functions Begin ###
 export DEBIAN_FRONTEND=noninteractive
@@ -59,16 +65,6 @@ function updaterc() {
     fi
 }
 
-function install_python_and_pip() {
-    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
-        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
-        ihf_remove_packages "python3-requests"
-    fi
-    ihf_install_packages "python3 python3-pip" && \
-    python3 -m pip install --break-system-packages --upgrade pip
-    
-}
-
 function install_xvfb() {
     if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
         # Xvfb is unavailable in RHEL systems
@@ -76,16 +72,22 @@ function install_xvfb() {
     fi
 }
 
+function install_pipx() {
+    ihf_install_packages "pipx" &&
+    $_PIPX_CMD ensurepath
+}
+
 function install_matlab_proxy() {
-    install_python_and_pip &&
+    install_pipx &&
     install_xvfb &&
-    python3 -m pip install --break-system-packages --upgrade matlab-proxy
+    $_PIPX_CMD install matlab-proxy
 }
 
 function install_jupyter_matlab_proxy() {
-    install_python_and_pip &&
-    install_xvfb &&
-    python3 -m pip install --break-system-packages --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
+    install_matlab_proxy &&
+    # TODO: Think about how to inject into existing Jupyter environments.
+    # This will override other Jupyter environments.
+    $_PIPX_CMD inject --include-apps --include-deps matlab-proxy jupyter-matlab-proxy jupyterlab jupyter 
 }
 
 function install_matlab_engine_for_python() {
@@ -103,12 +105,11 @@ function install_matlab_engine_for_python() {
     matlabengine_map['R2021a']="9.10"
     matlabengine_map['R2020b']="9.9"
     
-    install_python_and_pip &&
     
-    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
-
+    install_matlab_proxy && \
     env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    python3 -m pip install --break-system-packages matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+    $_PIPX_CMD inject matlab-proxy matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
 }
 
 # Create a home folder for non-root, undefined CONTAINER_USER, if not already available

From a699b832148f6bc295fa5656c37390e89a8d4f28 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Tue, 29 Jul 2025 04:09:55 +0000
Subject: [PATCH 07/19] using break system packages

---
 .devcontainer/basic/devcontainer.json         |  8 +--
 .../matlab/install-python-packages.sh         | 59 -------------------
 .devcontainer/matlab/install.sh               | 40 ++-----------
 .devcontainer/matlab/scope.sh                 | 19 ------
 .devcontainer/matlab/tests.sh                 | 25 --------
 src/matlab/install-python-packages.sh         | 59 -------------------
 src/matlab/install.sh                         | 42 +++++++------
 7 files changed, 31 insertions(+), 221 deletions(-)
 delete mode 100644 .devcontainer/matlab/install-python-packages.sh
 delete mode 100755 .devcontainer/matlab/scope.sh
 delete mode 100755 .devcontainer/matlab/tests.sh
 delete mode 100644 src/matlab/install-python-packages.sh

diff --git a/.devcontainer/basic/devcontainer.json b/.devcontainer/basic/devcontainer.json
index 3ad0842..0888c46 100644
--- a/.devcontainer/basic/devcontainer.json
+++ b/.devcontainer/basic/devcontainer.json
@@ -1,9 +1,9 @@
 {
     // "image": "ubuntu:24.04",
-    // "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-    // "remoteUser": "vscode",
-    "image": "mathworks/matlab:r2025a",
-    "containerUser": "matlab",
+    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    "remoteUser": "vscode",
+    // "image": "mathworks/matlab:r2025a",
+    // "containerUser": "matlab",
     "features": {
         "../matlab": {
             "release": "r2025a",
diff --git a/.devcontainer/matlab/install-python-packages.sh b/.devcontainer/matlab/install-python-packages.sh
deleted file mode 100644
index c090f3a..0000000
--- a/.devcontainer/matlab/install-python-packages.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2025 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-# NOTE: The 'install-python-package.sh' uses PIPX to install python packages into an environment known
-
-set -eu -o pipefail
-
-function install_python_and_pip() {
-    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
-        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
-        ihf_remove_packages "python3-requests"
-    fi
-    ihf_install_packages "python3 python3-pip" && \
-    python3 -m pip install --upgrade pip
-    
-}
-
-function install_xvfb() {
-    if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
-        # Xvfb is unavailable in RHEL systems
-        ihf_install_packages "xvfb"
-    fi
-}
-
-function install_matlab_proxy() {
-    install_python_and_pip &&
-    install_xvfb &&
-    python3 -m pip install --upgrade matlab-proxy
-}
-
-function install_jupyter_matlab_proxy() {
-    install_python_and_pip &&
-    install_xvfb &&
-    python3 -m pip install --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
-}
-
-function install_matlab_engine_for_python() {
-    # Installing the engine is tricky
-    # The installation can fail if the python version does not match the supported release
-    declare -A matlabengine_map
-    matlabengine_map['R2025a']="25.1"
-    matlabengine_map['R2024b']="24.2"
-    matlabengine_map['R2024a']="24.1"
-    matlabengine_map['R2023b']="23.2"
-    matlabengine_map['R2023a']="9.14"
-    matlabengine_map['R2022b']="9.13"
-    matlabengine_map['R2022a']="9.12"
-    matlabengine_map['R2021b']="9.11"
-    matlabengine_map['R2021a']="9.10"
-    matlabengine_map['R2020b']="9.9"
-    
-    install_python_and_pip &&
-    
-    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
-
-    env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    python3 -m pip install  matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
-}
\ No newline at end of file
diff --git a/.devcontainer/matlab/install.sh b/.devcontainer/matlab/install.sh
index 96d1a70..3352cf7 100755
--- a/.devcontainer/matlab/install.sh
+++ b/.devcontainer/matlab/install.sh
@@ -45,14 +45,7 @@ _CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
 
 _SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
 
-# PIPX settings, which be replaced with the --global flag once pipx versions >1.5 are available from APT
-# _PIPX_HOME=/opt/pipx
-# _PIPX_BIN_DIR=/usr/local/bin
-# _PIPX_MAN_DIR=/usr/local/share/man
-# _PIPX_INSTALL="env PIPX_HOME=${_PIPX_HOME} PIPX_BIN_DIR=${_PIPX_BIN_DIR} PIPX_MAN_DIR=${_PIPX_MAN_DIR} pipx install"
-_PIPX_UNINSTALL="pipx uninstall"
-_PIPX_INSTALL="pipx install --global"
-_PIPX_INJECT="pipx inject"
+_PIP_INSTALL="python3 -m pip install --break-system-packages --default-timeout=100"
 
 ### Variable Declaration End ###
 ### Helper Functions Begin ###
@@ -83,33 +76,13 @@ function install_python_and_pip() {
     ihf_install_packages "python3 python3-pip"
 }
 
-function install_pipx() {
-    ## The OS version of PIPX is old.
-    # ihf_install_packages "pipx"
-
-    # Cannot install PIPX in the presence of pipx installed by system
-    ihf_remove_packages "pipx"
-
-    # Then install PIPX through the PyPI to get the latest version of PIPX
-    python3 -m pip install --break-system-packages pipx
-
-    pipx ensurepath --prepend
-}
-
-
-# matlab-proxy is the pipx environment into which MW packages will be installed 
 _MATLAB_PROXY_HAS_BEEN_INSTALLED=0
 function install_matlab_proxy() {
     if [ "$_MATLAB_PROXY_HAS_BEEN_INSTALLED" -eq 0 ]; then 
         install_xvfb
 
-        ## Remove old references to matlab-proxy
-        # can't remove references that have been placed on the PATH by MATLAB user
-        # $_PIPX_UNINSTALL matlab-proxy &&
-        $_PIPX_INSTALL matlab-proxy
+        $_PIP_INSTALL matlab-proxy
 
-        # Fresh Install  
-        # Ensure that PIPX places installed applications on top of the PATH
         _MATLAB_PROXY_HAS_BEEN_INSTALLED=1
     else
         echo "MATLAB Proxy has been installed."
@@ -117,10 +90,7 @@ function install_matlab_proxy() {
 }
 
 function install_jupyter_matlab_proxy() {
-    install_matlab_proxy &&
-    # TODO: Think about how to inject into existing Jupyter environments.
-    # This will override other Jupyter environments.
-    $_PIPX_INJECT --include-apps --include-deps matlab-proxy jupyter-matlab-proxy jupyterlab jupyter 
+    $_PIP_INSTALL jupyter-matlab-proxy jupyterlab jupyter 
 }
 
 function install_matlab_engine_for_python() {
@@ -139,9 +109,8 @@ function install_matlab_engine_for_python() {
     matlabengine_map['R2020b']="9.9"
     
     
-    install_matlab_proxy && \
     env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    $_PIPX_INJECT matlab-proxy matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+    $_PIP_INSTALL matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
     echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
 }
 
@@ -193,7 +162,6 @@ MATLAB_FEATURE_INSTALL_TMPDIR=/tmp/matlab-feature-install
 mkdir -p $MATLAB_FEATURE_INSTALL_TMPDIR && pushd $MATLAB_FEATURE_INSTALL_TMPDIR
 
 install_python_and_pip
-install_pipx
 
 # Install matlab-proxy if requested
 if [ "${INSTALLMATLABPROXY}" == "true" ]; then
diff --git a/.devcontainer/matlab/scope.sh b/.devcontainer/matlab/scope.sh
deleted file mode 100755
index 6d1aa68..0000000
--- a/.devcontainer/matlab/scope.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-
-MATLAB_PROXY_INSTALL_COMPLETE=0
-
-
-function is_matlab_proxy_installation_complete() {
-    echo "state:$MATLAB_PROXY_INSTALL_COMPLETE"
-}
-
-function install_matlab_proxy() {
-    MATLAB_PROXY_INSTALL_COMPLETE=1
-}
-
-is_matlab_proxy_installation_complete
-install_matlab_proxy
-is_matlab_proxy_installation_complete
-
-
diff --git a/.devcontainer/matlab/tests.sh b/.devcontainer/matlab/tests.sh
deleted file mode 100755
index 47a3b1c..0000000
--- a/.devcontainer/matlab/tests.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Calls conatins to test the install scripts
-
-# Check default installation for R2024b
-RELEASE=R2024b
-RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
-# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted ubuntu:20.04 -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
-
-RELEASE=R2022b
-RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
-# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
-
-RELEASE=R2024b
-RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
-# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-docker run -it --rm --entrypoint /usr/bin/bash -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest
-
-# RELEASE=R2024a
-# RUN_INSTALL_SCRIPT="sudo env INSTALLMATLABENGINEFORPYTHON=true SKIPMATLABINSTALL=true _CONTAINER_USER=matlab \
-# _CONTAINER_USER_HOME=/home/matlab DESTINATION=/opt/matlab/${RELEASE^} RELEASE=${RELEASE} \
-# ~/install/install.sh "
-# TEST_IF_MATLABENGINE_INSTALLED="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-# docker run -it --rm --entrypoint /bin/sh -v `pwd`/src/matlab/:/home/matlab/install mathworks/matlab:${RELEASE} -c "$RUN_INSTALL_SCRIPT && $TEST_IF_MATLABENGINE_INSTALLED"
\ No newline at end of file
diff --git a/src/matlab/install-python-packages.sh b/src/matlab/install-python-packages.sh
deleted file mode 100644
index c090f3a..0000000
--- a/src/matlab/install-python-packages.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2025 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-# NOTE: The 'install-python-package.sh' uses PIPX to install python packages into an environment known
-
-set -eu -o pipefail
-
-function install_python_and_pip() {
-    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
-        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
-        ihf_remove_packages "python3-requests"
-    fi
-    ihf_install_packages "python3 python3-pip" && \
-    python3 -m pip install --upgrade pip
-    
-}
-
-function install_xvfb() {
-    if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
-        # Xvfb is unavailable in RHEL systems
-        ihf_install_packages "xvfb"
-    fi
-}
-
-function install_matlab_proxy() {
-    install_python_and_pip &&
-    install_xvfb &&
-    python3 -m pip install --upgrade matlab-proxy
-}
-
-function install_jupyter_matlab_proxy() {
-    install_python_and_pip &&
-    install_xvfb &&
-    python3 -m pip install --upgrade jupyter-matlab-proxy matlab-proxy jupyterlab jupyterlab-git
-}
-
-function install_matlab_engine_for_python() {
-    # Installing the engine is tricky
-    # The installation can fail if the python version does not match the supported release
-    declare -A matlabengine_map
-    matlabengine_map['R2025a']="25.1"
-    matlabengine_map['R2024b']="24.2"
-    matlabengine_map['R2024a']="24.1"
-    matlabengine_map['R2023b']="23.2"
-    matlabengine_map['R2023a']="9.14"
-    matlabengine_map['R2022b']="9.13"
-    matlabengine_map['R2022a']="9.12"
-    matlabengine_map['R2021b']="9.11"
-    matlabengine_map['R2021a']="9.10"
-    matlabengine_map['R2020b']="9.9"
-    
-    install_python_and_pip &&
-    
-    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
-
-    env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    python3 -m pip install  matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
-}
\ No newline at end of file
diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 778ed0c..8a9d6b0 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -45,11 +45,7 @@ _CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
 
 _SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
 
-# PIPX settings, which be replaced with the --global flag once pipx versions >1.5 are available from APT
-_PIPX_HOME=/opt/pipx
-_PIPX_BIN_DIR=/usr/local/bin
-_PIPX_MAN_DIR=/usr/local/share/man
-_PIPX_CMD="env PIPX_HOME=${_PIPX_HOME} PIPX_BIN_DIR=${_PIPX_BIN_DIR} PIPX_MAN_DIR=${_PIPX_MAN_DIR} pipx"
+_PIP_INSTALL="python3 -m pip install --break-system-packages"
 
 ### Variable Declaration End ###
 ### Helper Functions Begin ###
@@ -72,27 +68,34 @@ function install_xvfb() {
     fi
 }
 
-function install_pipx() {
-    ihf_install_packages "pipx" &&
-    $_PIPX_CMD ensurepath
+function install_python_and_pip() {
+    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
+        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
+        ihf_remove_packages "python3-requests"
+    fi
+    ihf_install_packages "python3 python3-pip"
 }
 
+_MATLAB_PROXY_HAS_BEEN_INSTALLED=0
 function install_matlab_proxy() {
-    install_pipx &&
-    install_xvfb &&
-    $_PIPX_CMD install matlab-proxy
+    if [ "$_MATLAB_PROXY_HAS_BEEN_INSTALLED" -eq 0 ]; then 
+        install_xvfb
+
+        $_PIP_INSTALL matlab-proxy
+
+        _MATLAB_PROXY_HAS_BEEN_INSTALLED=1
+    else
+        echo "MATLAB Proxy has been installed."
+    fi
 }
 
 function install_jupyter_matlab_proxy() {
-    install_matlab_proxy &&
-    # TODO: Think about how to inject into existing Jupyter environments.
-    # This will override other Jupyter environments.
-    $_PIPX_CMD inject --include-apps --include-deps matlab-proxy jupyter-matlab-proxy jupyterlab jupyter 
+    $_PIP_INSTALL jupyter-matlab-proxy jupyterlab jupyter 
 }
 
 function install_matlab_engine_for_python() {
-    # Installing the engine is tricky
-    # The installation can fail if the python version does not match the supported release
+    # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
+    # See: https://mathworks.com/support/requirements/python-compatibility.html
     declare -A matlabengine_map
     matlabengine_map['R2025a']="25.1"
     matlabengine_map['R2024b']="24.2"
@@ -106,9 +109,8 @@ function install_matlab_engine_for_python() {
     matlabengine_map['R2020b']="9.9"
     
     
-    install_matlab_proxy && \
     env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    $_PIPX_CMD inject matlab-proxy matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
+    $_PIP_INSTALL matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
     echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
 }
 
@@ -159,6 +161,8 @@ fi
 MATLAB_FEATURE_INSTALL_TMPDIR=/tmp/matlab-feature-install
 mkdir -p $MATLAB_FEATURE_INSTALL_TMPDIR && pushd $MATLAB_FEATURE_INSTALL_TMPDIR
 
+install_python_and_pip
+
 # Install matlab-proxy if requested
 if [ "${INSTALLMATLABPROXY}" == "true" ]; then
     echo "Installing matlab-proxy"

From 3c3458621b23da918ef58260ea139ecc72e0a9a1 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Tue, 16 Sep 2025 13:34:11 +0530
Subject: [PATCH 08/19] Break System package installation using environment
 variable.

---
 .devcontainer/basic/devcontainer.json         | 12 +--
 .devcontainer/matlab/README.md                | 40 +++++++++
 .devcontainer/matlab/TODO.md                  | 83 +++++++++++++++++++
 .../matlab/devcontainer-feature.json          | 12 +--
 .devcontainer/matlab/install.sh               | 18 +++-
 .devcontainer/matlab/tests.sh                 | 25 ++++++
 src/matlab/README.md                          | 11 +++
 src/matlab/devcontainer-feature.json          |  6 ++
 src/matlab/install.sh                         | 18 +++-
 9 files changed, 210 insertions(+), 15 deletions(-)
 create mode 100644 .devcontainer/matlab/README.md
 create mode 100644 .devcontainer/matlab/TODO.md
 create mode 100755 .devcontainer/matlab/tests.sh

diff --git a/.devcontainer/basic/devcontainer.json b/.devcontainer/basic/devcontainer.json
index 0888c46..d46f9b6 100644
--- a/.devcontainer/basic/devcontainer.json
+++ b/.devcontainer/basic/devcontainer.json
@@ -3,14 +3,16 @@
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "remoteUser": "vscode",
     // "image": "mathworks/matlab:r2025a",
+    // The problem with mathworks/matlab is matlab-proxy is already installed by pipx! What do we do here?
     // "containerUser": "matlab",
     "features": {
         "../matlab": {
             "release": "r2025a",
-            "skipMATLABInstall": true,
+            "skipMATLABInstall": false,
             "installMatlabProxy": true,
             "installJupyterMatlabProxy": true,
-            "installMatlabEngineForPython": true
+            "installMatlabEngineForPython": true,
+            "installJupyterLab": true
         }
     },
     // Configure VSCode Extensions
@@ -23,11 +25,11 @@
             ],
             "settings": {
                 "MATLAB.signIn": true,
-                "python.venvPath": "/opt/pipx/venvs/",
+                // "python.venvPath": "/opt/pipx/venvs/",
                 // Marks MATLAB Kernel as a trusted source
                 "jupyter.kernels.trusted": [
-                    // "/usr/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json",
-                    "opt/pipx/venvs/matlab-proxy/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json"
+                    "/usr/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json",
+                    // "opt/pipx/venvs/matlab-proxy/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json"
                 ]
             }
         }
diff --git a/.devcontainer/matlab/README.md b/.devcontainer/matlab/README.md
new file mode 100644
index 0000000..695b4ac
--- /dev/null
+++ b/.devcontainer/matlab/README.md
@@ -0,0 +1,40 @@
+
+# MATLAB (matlab)
+
+Installs MATLAB with supporting packages and tools.
+
+## Example Usage
+
+```json
+"features": {
+    "ghcr.io/mathworks/devcontainer-features/matlab:0": {}
+}
+```
+
+## Options
+
+| Options Id | Description | Type | Default Value |
+|-----|-----|-----|-----|
+| release | MATLAB Release to install. | string | R2024b |
+| products | Products to install, specified as a list of space-separated product names.</br> For details of products, see [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md#product-installation-options). | string | MATLAB |
+| doc | Flag to install documentation and examples (R2022b and earlier releases). | boolean | false |
+| installGpu | Skips installation of GPU libraries when you install Parallel Computing Toolbox (R2023a and later releases). | boolean | false |
+| destination | Full path to the installation destination folder. Default: /opt/matlab/${RELEASE^} | string | - |
+| installMatlabProxy | Installs matlab-proxy and its dependencies (R2020b and later releases). | boolean | false |
+| installJupyterMatlabProxy | Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases). | boolean | false |
+| installMatlabEngineForPython | Installs the MATLAB Engine for Python if the destination option is set correctly. | boolean | false |
+| startInDesktop | Starts matlab-proxy when container starts. | string | false |
+| networkLicenseManager | MATLAB will use the specified Network License Manager. | string | - |
+| skipMATLABInstall | Set to true if you do not want to install MATLAB, for example if you only want to install `matlab-proxy` or `jupyter-matlab-proxy`. | boolean | false |
+
+## Customizations
+
+### VS Code Extensions
+
+- `MathWorks.language-matlab`
+
+
+
+---
+
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/mathworks/devcontainer-features/blob/main/src/matlab/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/.devcontainer/matlab/TODO.md b/.devcontainer/matlab/TODO.md
new file mode 100644
index 0000000..d318a1e
--- /dev/null
+++ b/.devcontainer/matlab/TODO.md
@@ -0,0 +1,83 @@
+
+# How to install matlab-proxy, jupyter-matlab-proxy or the MATLAB Engine for python 3.12?
+
+- The base install.sh script will install PIPX.
+- The onCreateCommand lifecycle hook, can then call another script to install python packages using PIPX into a single environment.
+- The script will need to be placed into a location that the user can access later on!
+    - Assumptions:
+        * The script has access to the configuration in the JSON file, so that it knows which packages to install.
+        * The script is being run as the end user of the container, only then will the installations by PIPX be visible and on PATH for that user.
+        
+## How to do it?
+
+- Create a base environment, lets say matlab-proxy
+```bash
+pipx install matlab-proxy
+```
+- Then based on other feature requirements, install the others while including their installed apps
+```bash
+pipx inject --include-apps --include-deps matlab-proxy jupyterlab jupyter-matlab-proxy
+```
+
+using pipx would:
+1. Make sure that matlab-proxy-app, is on the path.
+2. However, generic python packages like matlabengine & jupyter-matlab-proxy will not be available to users
+
+What is the user expectation?
+* When the codespace/devcontainer uses the feature:
+    a. The environment is already configured with all the things he needs.
+
+* E1: He expects to have the python interpreter setup
+* E2: He expects to have matlabengine available for use with the python interpreter that is setup
+* E3: If Jupyterlab is available, then he expects to see the MATLAB Integration for Jupyter to show up
+* E4: He expects to have the matlab-proxy-app executable available to call
+
+Strategy 1: PIPX to install MP, JMP + Jupyter, ME into a single PIPX MATLAB VENV
+
+Expectations met: E4, E3, E2(only if he uses the notebook)
+Expectations failed: E1 & E2
+
+Strategy 2: Strategy 1 + Activate the PIPX MATLAB VENV
+
+NOTES:
+* PIPX is a tool to install command line utilities, and not meant for environment management.
+* Renaming of environments created using PIPX is directly supported. 
+    - one could rename the 
+
+
+# Attempt 1:
+Using the --global flag or equivalent option in PIPX along with ensureonpath as root user.
+This allows for the executables to be available for the logged in user.
+
+PIPX is anyways not meant to be a solution for extensibility of packages.
+
+## Behavior
+1. executables are found on path by end user.
+2. there may be shadowing of executables. ex: mathworks/matlab installs MPA, and that executable sits higher up on the path than the one installed by the devcontainer feature.
+3. 
+
+## To Check:
+See if the notebook can be used from vscode.
+
+## Issues found:
+1. mathworks/matlab:r2025a had issues with user privileges. The mounted repostiory files could not be used.
+    * There may be a way to get past this in the devcontainer configuration files.
+
+2. 
+
+## Discoveries
+1. MATLAB Engine for Python was able to render the login screens when using `-licmode onlinelicensing`
+   The environment was: A Devcontainer running WSL2 on Windows  
+# Thoughts
+
+## what are the goals of the devcontainer feature.
+* Make it easy to install MATLAB into devcontainers
+* Make it easier to use MATLAB in the containerized environment
+
+* What are the ways in which people use MATLAB:
+ 1. command line
+ 2. VSCode editor run and edit
+ 3. Jupyter notebooks in vscode.
+ 4. Jupyter executable
+ 5. Desktop MATLAB 
+ 6. 
diff --git a/.devcontainer/matlab/devcontainer-feature.json b/.devcontainer/matlab/devcontainer-feature.json
index 3ab16f0..34c1ef4 100644
--- a/.devcontainer/matlab/devcontainer-feature.json
+++ b/.devcontainer/matlab/devcontainer-feature.json
@@ -8,6 +8,7 @@
         "release": {
             "type": "string",
             "proposals": [
+                "R2025b",
                 "R2025a",
                 "R2024b",
                 "R2024a",
@@ -59,6 +60,11 @@
             "description": "Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases).",
             "type": "boolean"
         },
+        "installJupyterLab": {
+            "default": false,
+            "description": "Installs jupyterlab",
+            "type": "boolean"
+        },
         "installMatlabEngineForPython": {
             "default": false,
             "description": "Installs the MATLAB Engine for Python if the destination option is set correctly.",
@@ -86,14 +92,8 @@
             "type": "boolean",
             "default": false,
             "description": "Set to true if you do not want to install MATLAB, for example if you only want to install `matlab-proxy` or `jupyter-matlab-proxy`."
-        },
-        "addContainerUserToDevGroup":{
-            "type": "string",
-            "default": "",
-            "description": "Enter the name of the containerUser that should be given access to the mounted folder. When containerUserName is provided, a group is created and the provided username is added to that group. The onCreateCommand Lifecycle hook then sets the permissions for that user to Read/Write/Execute from the mounted workspace folders."
         }
     },
-    // "onCreateCommand": "bash ?",
     "postStartCommand": "( ls ~/.startmatlabdesktop >> /dev/null 2>&1 && env MWI_APP_PORT=8888 matlab-proxy-app 2>/dev/null ) || echo 'Will not start matlab-proxy-app...'",
     "customizations": {
         "vscode": {
diff --git a/.devcontainer/matlab/install.sh b/.devcontainer/matlab/install.sh
index 3352cf7..692abf6 100755
--- a/.devcontainer/matlab/install.sh
+++ b/.devcontainer/matlab/install.sh
@@ -25,6 +25,7 @@ INSTALLGPU="${INSTALLGPU:-"false"}"
 DESTINATION="${DESTINATION:-"/opt/matlab/${RELEASE^}"}"
 INSTALLMATLABPROXY="${INSTALLMATLABPROXY:-"false"}"
 INSTALLJUPYTERMATLABPROXY="${INSTALLJUPYTERMATLABPROXY:-"false"}"
+INSTALLJUPYTERLAB="${INSTALLJUPYTERLAB:-"false"}"
 INSTALLMATLABENGINEFORPYTHON="${INSTALLMATLABENGINEFORPYTHON:-"false"}"
 STARTINDESKTOP="${STARTINDESKTOP:-"false"}"
 NETWORKLICENSEMANAGER="${NETWORKLICENSEMANAGER:-" "}"
@@ -45,7 +46,8 @@ _CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
 
 _SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
 
-_PIP_INSTALL="python3 -m pip install --break-system-packages --default-timeout=100"
+_PIP_INSTALL="python3 -m pip install"
+export PIP_BREAK_SYSTEM_PACKAGES=1
 
 ### Variable Declaration End ###
 ### Helper Functions Begin ###
@@ -90,13 +92,18 @@ function install_matlab_proxy() {
 }
 
 function install_jupyter_matlab_proxy() {
-    $_PIP_INSTALL jupyter-matlab-proxy jupyterlab jupyter 
+    $_PIP_INSTALL jupyter-matlab-proxy
+}
+
+function install_jupyterlab() {
+    $_PIP_INSTALL jupyterlab jupyter
 }
 
 function install_matlab_engine_for_python() {
     # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
     # See: https://mathworks.com/support/requirements/python-compatibility.html
     declare -A matlabengine_map
+    matlabengine_map['R2025b']="25.2"
     matlabengine_map['R2025a']="25.1"
     matlabengine_map['R2024b']="24.2"
     matlabengine_map['R2024a']="24.1"
@@ -175,6 +182,12 @@ if [ "${INSTALLJUPYTERMATLABPROXY}" == "true" ]; then
     install_jupyter_matlab_proxy
 fi
 
+# Install jupyterlab if requested
+if [ "${INSTALLJUPYTERLAB}" == "true" ]; then
+    echo "Installing jupyterlab"
+    install_jupyterlab
+fi
+
 if [ "${STARTINDESKTOP}" == "true" ] || [ "${STARTINDESKTOP}" == "test" ]; then
     echo "User wants to start in MATLAB Desktop."
     # Leave a marker file that can be checked by the postStartCommand
@@ -303,4 +316,5 @@ fi
 popd
 ### Script Section End ###
 echo "MATLAB feature installation is complete."
+unset PIP_BREAK_SYSTEM_PACKAGES
 exit 0
diff --git a/.devcontainer/matlab/tests.sh b/.devcontainer/matlab/tests.sh
new file mode 100755
index 0000000..47a3b1c
--- /dev/null
+++ b/.devcontainer/matlab/tests.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Calls conatins to test the install scripts
+
+# Check default installation for R2024b
+RELEASE=R2024b
+RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
+# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted ubuntu:20.04 -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
+
+RELEASE=R2022b
+RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
+# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
+
+RELEASE=R2024b
+RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
+# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+docker run -it --rm --entrypoint /usr/bin/bash -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest
+
+# RELEASE=R2024a
+# RUN_INSTALL_SCRIPT="sudo env INSTALLMATLABENGINEFORPYTHON=true SKIPMATLABINSTALL=true _CONTAINER_USER=matlab \
+# _CONTAINER_USER_HOME=/home/matlab DESTINATION=/opt/matlab/${RELEASE^} RELEASE=${RELEASE} \
+# ~/install/install.sh "
+# TEST_IF_MATLABENGINE_INSTALLED="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
+# docker run -it --rm --entrypoint /bin/sh -v `pwd`/src/matlab/:/home/matlab/install mathworks/matlab:${RELEASE} -c "$RUN_INSTALL_SCRIPT && $TEST_IF_MATLABENGINE_INSTALLED"
\ No newline at end of file
diff --git a/src/matlab/README.md b/src/matlab/README.md
index 695b4ac..66a8b04 100644
--- a/src/matlab/README.md
+++ b/src/matlab/README.md
@@ -38,3 +38,14 @@ Installs MATLAB with supporting packages and tools.
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/mathworks/devcontainer-features/blob/main/src/matlab/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
+
+
+## Things to Test:
+
+1. Works with the following images & python versions:
+
+ - Ubuntu 22.04 / Python 3.10
+ - Ubuntu 24.04 / Python 3.12
+
+2. What is the strategy for mathworks/matlab images which already have matlab-proxy installed?
+   The usecase could be that someone wants to install JMP and use with Jupyter ? 
\ No newline at end of file
diff --git a/src/matlab/devcontainer-feature.json b/src/matlab/devcontainer-feature.json
index 67c7ac4..34c1ef4 100644
--- a/src/matlab/devcontainer-feature.json
+++ b/src/matlab/devcontainer-feature.json
@@ -8,6 +8,7 @@
         "release": {
             "type": "string",
             "proposals": [
+                "R2025b",
                 "R2025a",
                 "R2024b",
                 "R2024a",
@@ -59,6 +60,11 @@
             "description": "Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases).",
             "type": "boolean"
         },
+        "installJupyterLab": {
+            "default": false,
+            "description": "Installs jupyterlab",
+            "type": "boolean"
+        },
         "installMatlabEngineForPython": {
             "default": false,
             "description": "Installs the MATLAB Engine for Python if the destination option is set correctly.",
diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 8a9d6b0..692abf6 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -25,6 +25,7 @@ INSTALLGPU="${INSTALLGPU:-"false"}"
 DESTINATION="${DESTINATION:-"/opt/matlab/${RELEASE^}"}"
 INSTALLMATLABPROXY="${INSTALLMATLABPROXY:-"false"}"
 INSTALLJUPYTERMATLABPROXY="${INSTALLJUPYTERMATLABPROXY:-"false"}"
+INSTALLJUPYTERLAB="${INSTALLJUPYTERLAB:-"false"}"
 INSTALLMATLABENGINEFORPYTHON="${INSTALLMATLABENGINEFORPYTHON:-"false"}"
 STARTINDESKTOP="${STARTINDESKTOP:-"false"}"
 NETWORKLICENSEMANAGER="${NETWORKLICENSEMANAGER:-" "}"
@@ -45,7 +46,8 @@ _CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
 
 _SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
 
-_PIP_INSTALL="python3 -m pip install --break-system-packages"
+_PIP_INSTALL="python3 -m pip install"
+export PIP_BREAK_SYSTEM_PACKAGES=1
 
 ### Variable Declaration End ###
 ### Helper Functions Begin ###
@@ -90,13 +92,18 @@ function install_matlab_proxy() {
 }
 
 function install_jupyter_matlab_proxy() {
-    $_PIP_INSTALL jupyter-matlab-proxy jupyterlab jupyter 
+    $_PIP_INSTALL jupyter-matlab-proxy
+}
+
+function install_jupyterlab() {
+    $_PIP_INSTALL jupyterlab jupyter
 }
 
 function install_matlab_engine_for_python() {
     # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
     # See: https://mathworks.com/support/requirements/python-compatibility.html
     declare -A matlabengine_map
+    matlabengine_map['R2025b']="25.2"
     matlabengine_map['R2025a']="25.1"
     matlabengine_map['R2024b']="24.2"
     matlabengine_map['R2024a']="24.1"
@@ -175,6 +182,12 @@ if [ "${INSTALLJUPYTERMATLABPROXY}" == "true" ]; then
     install_jupyter_matlab_proxy
 fi
 
+# Install jupyterlab if requested
+if [ "${INSTALLJUPYTERLAB}" == "true" ]; then
+    echo "Installing jupyterlab"
+    install_jupyterlab
+fi
+
 if [ "${STARTINDESKTOP}" == "true" ] || [ "${STARTINDESKTOP}" == "test" ]; then
     echo "User wants to start in MATLAB Desktop."
     # Leave a marker file that can be checked by the postStartCommand
@@ -303,4 +316,5 @@ fi
 popd
 ### Script Section End ###
 echo "MATLAB feature installation is complete."
+unset PIP_BREAK_SYSTEM_PACKAGES
 exit 0

From 9df6857c3bce452b3cddc024ac0c097b40e14e14 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Tue, 16 Sep 2025 20:58:37 +0530
Subject: [PATCH 09/19] Fix bugs

---
 .devcontainer/basic/devcontainer.json            | 1 +
 .devcontainer/matlab/devcontainer-feature.json   | 4 ++--
 .devcontainer/matlab/install-helper-functions.sh | 5 ++---
 src/matlab/devcontainer-feature.json             | 4 ++--
 src/matlab/install-helper-functions.sh           | 5 ++---
 test/matlab/scenarios.json                       | 6 +++---
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/basic/devcontainer.json b/.devcontainer/basic/devcontainer.json
index d46f9b6..5311031 100644
--- a/.devcontainer/basic/devcontainer.json
+++ b/.devcontainer/basic/devcontainer.json
@@ -25,6 +25,7 @@
             ],
             "settings": {
                 "MATLAB.signIn": true,
+                // "MATLAB.installPath": "/opt/matlab/R2025a",
                 // "python.venvPath": "/opt/pipx/venvs/",
                 // Marks MATLAB Kernel as a trusted source
                 "jupyter.kernels.trusted": [
diff --git a/.devcontainer/matlab/devcontainer-feature.json b/.devcontainer/matlab/devcontainer-feature.json
index 34c1ef4..40d192d 100644
--- a/.devcontainer/matlab/devcontainer-feature.json
+++ b/.devcontainer/matlab/devcontainer-feature.json
@@ -102,8 +102,8 @@
             ],
             "settings": {
                 "MATLAB.indexWorkspace": true,
-                "MATLAB.installPath": "/usr/local/bin/matlab",
-                "MATLAB.matlabConnectionTiming": "never",
+                "MATLAB.signIn": true,
+                "MATLAB.matlabConnectionTiming": "onDemand",
                 "MATLAB.telemetry": true
             }
         }
diff --git a/.devcontainer/matlab/install-helper-functions.sh b/.devcontainer/matlab/install-helper-functions.sh
index 5a35e89..46e67f8 100755
--- a/.devcontainer/matlab/install-helper-functions.sh
+++ b/.devcontainer/matlab/install-helper-functions.sh
@@ -34,12 +34,11 @@ function ihf_get_matlab_deps_os() {
     case ${LINUX_DISTRO} in
         debian)
             if [[ "${ID}" == "ubuntu" ]]; then
-                local SUPPORTED_VERSION_CODENAME="focal jammy"
                 MATLAB_DEPS_OS_VERSION=${ID}${VERSION_ID}
-                elif [[ "${ID}" == "debian" ]]; then
-                local SUPPORTED_VERSION_CODENAME="bullseye bookworm"
+            elif [[ "${ID}" == "debian" ]]; then
                 local UBUNTU_VERSION_ID=${VERSION_ID/11/20.04}
                 UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/12/22.04}
+                UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/13/24.04}
                 MATLAB_DEPS_OS_VERSION=ubuntu${UBUNTU_VERSION_ID}
             fi
         ;;
diff --git a/src/matlab/devcontainer-feature.json b/src/matlab/devcontainer-feature.json
index 34c1ef4..40d192d 100644
--- a/src/matlab/devcontainer-feature.json
+++ b/src/matlab/devcontainer-feature.json
@@ -102,8 +102,8 @@
             ],
             "settings": {
                 "MATLAB.indexWorkspace": true,
-                "MATLAB.installPath": "/usr/local/bin/matlab",
-                "MATLAB.matlabConnectionTiming": "never",
+                "MATLAB.signIn": true,
+                "MATLAB.matlabConnectionTiming": "onDemand",
                 "MATLAB.telemetry": true
             }
         }
diff --git a/src/matlab/install-helper-functions.sh b/src/matlab/install-helper-functions.sh
index 5a35e89..46e67f8 100755
--- a/src/matlab/install-helper-functions.sh
+++ b/src/matlab/install-helper-functions.sh
@@ -34,12 +34,11 @@ function ihf_get_matlab_deps_os() {
     case ${LINUX_DISTRO} in
         debian)
             if [[ "${ID}" == "ubuntu" ]]; then
-                local SUPPORTED_VERSION_CODENAME="focal jammy"
                 MATLAB_DEPS_OS_VERSION=${ID}${VERSION_ID}
-                elif [[ "${ID}" == "debian" ]]; then
-                local SUPPORTED_VERSION_CODENAME="bullseye bookworm"
+            elif [[ "${ID}" == "debian" ]]; then
                 local UBUNTU_VERSION_ID=${VERSION_ID/11/20.04}
                 UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/12/22.04}
+                UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/13/24.04}
                 MATLAB_DEPS_OS_VERSION=ubuntu${UBUNTU_VERSION_ID}
             fi
         ;;
diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index 5f94c3a..b85e73f 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -59,11 +59,11 @@
         "containerUser": "vscode"
     },
     "install_matlab_engine_for_python": {
-        "image": "mathworks/matlab:r2024a",
+        "image": "mathworks/matlab:r2024b",
         "features": {
             "matlab": {
-                "release": "r2024a",
-                "destination": "/opt/matlab/R2024a",
+                "release": "r2024b",
+                "destination": "/opt/matlab/R2024b",
                 "skipMATLABInstall": true,
                 "installMatlabEngineForPython": true
             }

From 04e90babc1606a8fb5ddafeafcbcfbe9676c8606 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Thu, 18 Sep 2025 19:18:14 +0530
Subject: [PATCH 10/19] Deleting redundant tests, filter unavailable packages
 for debian 13

---
 .../matlab/install-helper-functions.sh        | 12 +++-
 .devcontainer/matlab/install-matlab-deps.sh   |  5 +-
 src/matlab/install-helper-functions.sh        | 12 +++-
 src/matlab/install-matlab-deps.sh             |  5 +-
 test/matlab/check_ubi9.sh                     | 35 +++---------
 ...s_as_container_user.sh => check_ubuntu.sh} | 41 +++++--------
 test/matlab/install_jupyter_matlab_proxy.sh   | 46 ---------------
 .../install_matlab_engine_for_python.sh       | 52 -----------------
 test/matlab/install_release_on_ubuntu.sh      | 11 ----
 test/matlab/install_release_on_ubuntu24.04.sh | 14 -----
 test/matlab/scenarios.json                    | 57 +++----------------
 test/matlab/start_in_matlab_proxy_desktop.sh  | 48 ----------------
 12 files changed, 60 insertions(+), 278 deletions(-)
 rename test/matlab/{install_support_packages_as_container_user.sh => check_ubuntu.sh} (64%)
 delete mode 100644 test/matlab/install_jupyter_matlab_proxy.sh
 delete mode 100644 test/matlab/install_matlab_engine_for_python.sh
 delete mode 100644 test/matlab/install_release_on_ubuntu.sh
 delete mode 100644 test/matlab/install_release_on_ubuntu24.04.sh
 delete mode 100644 test/matlab/start_in_matlab_proxy_desktop.sh

diff --git a/.devcontainer/matlab/install-helper-functions.sh b/.devcontainer/matlab/install-helper-functions.sh
index 46e67f8..0e8b07a 100755
--- a/.devcontainer/matlab/install-helper-functions.sh
+++ b/.devcontainer/matlab/install-helper-functions.sh
@@ -135,7 +135,7 @@ function ihf_get_remove_cmd() {
 # returns "true/false" string if MATLAB_RELEASE is valid
 function ihf_is_valid_matlab_release() {
     # List of supported MATLAB_RELEASE values
-    local _SUPPORTED_MATLAB_RELEASES=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
+    local _SUPPORTED_MATLAB_RELEASES=("R2025b" "R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
     
     ## Validate MATLAB_RELEASE
     if [ -z "$MATLAB_RELEASE" ]; then
@@ -163,6 +163,16 @@ function ihf_is_debian_or_rhel() {
     fi
 }
 
+
+function ihf_is_debian_13 {
+    . /etc/os-release
+    if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" = "13" ]; then
+        echo "true"
+    else
+        echo "false"
+    fi
+}
+
 function ihf_clean_up() {
     local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
     case ${LINUX_DISTRO} in
diff --git a/.devcontainer/matlab/install-matlab-deps.sh b/.devcontainer/matlab/install-matlab-deps.sh
index 2b75be8..bc2e57d 100755
--- a/.devcontainer/matlab/install-matlab-deps.sh
+++ b/.devcontainer/matlab/install-matlab-deps.sh
@@ -43,6 +43,10 @@ function get_base_dependencies_list() {
     local BASE_DEPS_URL=https://raw.githubusercontent.com/mathworks-ref-arch/container-images/main/matlab-deps/${MATLAB_RELEASE,}/${MATLAB_DEPS_OS_VERSION}/base-dependencies.txt
     # Get matlab_deps - if this fails, then we aren't on a supported os
     local PKGS=$(wget -qO- ${BASE_DEPS_URL})
+    # if Debian 13, then remove packages which have dpdk in their name
+    if [ "$(ihf_is_debian_13)" == "true" ]; then
+        PKGS=$(echo $PKGS | tr ' ' '\n' | grep -v 'dpdk' | tr '\n' ' ')
+    fi
     if [ -z "$PKGS" ]; then
         ihf_print_and_exit "${MATLAB_DEPS_OS_VERSION} is not a supported OS for MATLAB ${MATLAB_RELEASE} ."
     fi
@@ -51,7 +55,6 @@ function get_base_dependencies_list() {
 
 function install_matlab_deps() {
     local MATLAB_DEPS_OS_VERSION=$(ihf_get_matlab_deps_os)
-    # local linux_distro=$(ihf_is_debian_or_rhel)
     
     print_os_info
     
diff --git a/src/matlab/install-helper-functions.sh b/src/matlab/install-helper-functions.sh
index 46e67f8..0e8b07a 100755
--- a/src/matlab/install-helper-functions.sh
+++ b/src/matlab/install-helper-functions.sh
@@ -135,7 +135,7 @@ function ihf_get_remove_cmd() {
 # returns "true/false" string if MATLAB_RELEASE is valid
 function ihf_is_valid_matlab_release() {
     # List of supported MATLAB_RELEASE values
-    local _SUPPORTED_MATLAB_RELEASES=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
+    local _SUPPORTED_MATLAB_RELEASES=("R2025b" "R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
     
     ## Validate MATLAB_RELEASE
     if [ -z "$MATLAB_RELEASE" ]; then
@@ -163,6 +163,16 @@ function ihf_is_debian_or_rhel() {
     fi
 }
 
+
+function ihf_is_debian_13 {
+    . /etc/os-release
+    if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" = "13" ]; then
+        echo "true"
+    else
+        echo "false"
+    fi
+}
+
 function ihf_clean_up() {
     local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
     case ${LINUX_DISTRO} in
diff --git a/src/matlab/install-matlab-deps.sh b/src/matlab/install-matlab-deps.sh
index 2b75be8..bc2e57d 100755
--- a/src/matlab/install-matlab-deps.sh
+++ b/src/matlab/install-matlab-deps.sh
@@ -43,6 +43,10 @@ function get_base_dependencies_list() {
     local BASE_DEPS_URL=https://raw.githubusercontent.com/mathworks-ref-arch/container-images/main/matlab-deps/${MATLAB_RELEASE,}/${MATLAB_DEPS_OS_VERSION}/base-dependencies.txt
     # Get matlab_deps - if this fails, then we aren't on a supported os
     local PKGS=$(wget -qO- ${BASE_DEPS_URL})
+    # if Debian 13, then remove packages which have dpdk in their name
+    if [ "$(ihf_is_debian_13)" == "true" ]; then
+        PKGS=$(echo $PKGS | tr ' ' '\n' | grep -v 'dpdk' | tr '\n' ' ')
+    fi
     if [ -z "$PKGS" ]; then
         ihf_print_and_exit "${MATLAB_DEPS_OS_VERSION} is not a supported OS for MATLAB ${MATLAB_RELEASE} ."
     fi
@@ -51,7 +55,6 @@ function get_base_dependencies_list() {
 
 function install_matlab_deps() {
     local MATLAB_DEPS_OS_VERSION=$(ihf_get_matlab_deps_os)
-    # local linux_distro=$(ihf_is_debian_or_rhel)
     
     print_os_info
     
diff --git a/test/matlab/check_ubi9.sh b/test/matlab/check_ubi9.sh
index f69e20f..d3d66e9 100644
--- a/test/matlab/check_ubi9.sh
+++ b/test/matlab/check_ubi9.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 #-------------------------------------------------------------------------------------------------------------
 #
 # This test file will be executed against one of the scenarios devcontainer.json test that
@@ -9,32 +9,13 @@
 # the end users HOME folder and not into the root users folders. Installing into root will
 # result in users being unable to access the Support Packages.
 #
-# "check_ubi9": {
-#         "image": "registry.access.redhat.com/ubi9/ubi:latest",
-#         "features": {
-#             "ghcr.io/devcontainers/features/common-utils:2": {
-#                 "installZsh": false,
-#                 "installOhMyZshConfig": false,
-#                 "username": "vscode",
-#                 "userUid": "1000",
-#                 "userGid": "1000",
-#                 "upgradePackages": "true"
-#             },
-#             "matlab": {
-#                 "release": "R2024a",
-#                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
-#                 "startInDesktop": "test"
-#             }
-#         },
-#         "containerUser": "vscode"
-#     }
 
 # This test can be run with the following command:
 #
 #    devcontainer features test \
 #                   --features matlab   \
 #                   --remote-user root \
-#                   --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
+#                   --base-image registry.access.redhat.com/ubi9/ubi:latest \
 #                   `pwd`
 # OR:
 # devcontainer features test -p `pwd` -f matlab --filter check_ubi9  --log-level debug
@@ -55,17 +36,19 @@ check "R2024a is installed" bash -c "cat /opt/matlab/R2024a/VersionInfo.xml | gr
 # Verify MATLAB_Support_Package_for_Android_Sensors is installed at the right place (ie: The home folder for the containerUser : vscode )
 check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2024a/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
 
+check "is startInDesktop marker file present" bash -c "ls ~/.teststartmatlabdesktop"
 
-check "python3 is installed" python3 --version
+check "NLM information is saved in bashrc " bash -c "echo $MLM_LICENSE_FILE | grep 123@abc.com "
 
-check "matlab-proxy has been installed"  bash -c "python3 -m pip list | grep matlab-proxy"
+check "python3 is installed " bash -c "python3 --version"
 
-check "matlab-proxy-app is callable" bash -c "matlab-proxy-app -h"
+check "matlab-proxy has been installed"  bash -c "python3 -m pip list | grep matlab-proxy"
 
-check "is startInDesktop marker file present" bash -c "ls ~/.teststartmatlabdesktop"
+check "matlab-proxy-app is callable" bash -c "matlab-proxy-app -v"
 
-check "jupyter-lab is installed" bash -c "jupyter-lab --version"
+check "jupyter lab is installed" bash -c "jupyter lab --version"
 
+check "MATLAB Engine for python is installed" bash -c "python3 -m pip list | grep -i 'matlabengine'"
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/matlab/install_support_packages_as_container_user.sh b/test/matlab/check_ubuntu.sh
similarity index 64%
rename from test/matlab/install_support_packages_as_container_user.sh
rename to test/matlab/check_ubuntu.sh
index 2de1a43..cc3d2f0 100644
--- a/test/matlab/install_support_packages_as_container_user.sh
+++ b/test/matlab/check_ubuntu.sh
@@ -1,35 +1,14 @@
 #!/bin/bash
 #-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 #-------------------------------------------------------------------------------------------------------------
 #
 # This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with the R2025a release, and a support package installed.
+# includes the 'matlab' feature with the R2025b release, and a support package installed.
 # Support package installation is special, because these packages need to be installed into
 # the end users HOME folder and not into the root users folders. Installing into root will
 # result in users being unable to access the Support Packages.
 #
-# "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-# "features": {
-#     "ghcr.io/devcontainers/features/common-utils:2": {
-#         "installZsh": false,
-#         "installOhMyZshConfig": false,
-#         "username": "vscode",
-#         "userUid": "1000",
-#         "userGid": "1000",
-#         "upgradePackages": "true"
-#     },
-#     "ghcr.io/devcontainers/features/python": {
-#         "version": "3.9",
-#         "installTools": false
-#     },
-#     "matlab": {
-#         "release": "R2025a",
-#         "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
-#         "installMatlabEngineForPython": true
-#     }
-# },
-# "containerUser": "vscode"
 
 # This test can be run with the following command:
 #
@@ -50,16 +29,24 @@ source dev-container-features-test-lib
 # check <LABEL> <cmd> [args...]
 
 # Verify that the right release is installed in the expected location.
-check "R2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
+check "R2025b is installed" bash -c "cat /opt/matlab/R2025b/VersionInfo.xml | grep '<release>R2025b</release>'"
 
 # Verify MATLAB_Support_Package_for_Android_Sensors is installed at the right place (ie: The home folder for the containerUser : vscode )
-check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025a/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
+check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025b/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
+
+check "is startInDesktop marker file present" bash -c "ls ~/.teststartmatlabdesktop"
+
+check "NLM information is saved in bashrc " bash -c "echo $MLM_LICENSE_FILE | grep 123@abc.com "
 
 check "python3 is installed " bash -c "python3 --version"
 
-# Verify that MATLAB engine for python is successfully installed
-check "MATLAB Engine for python is installed" bash -c "python3 -m pip list | grep -i 'matlabengine'"
+check "matlab-proxy has been installed"  bash -c "python3 -m pip list | grep matlab-proxy"
 
+check "matlab-proxy-app is callable" bash -c "matlab-proxy-app -v"
+
+check "jupyter lab is installed" bash -c "jupyter lab --version"
+
+check "MATLAB Engine for python is installed" bash -c "python3 -m pip list | grep -i 'matlabengine'"
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/matlab/install_jupyter_matlab_proxy.sh b/test/matlab/install_jupyter_matlab_proxy.sh
deleted file mode 100644
index 6cf7d02..0000000
--- a/test/matlab/install_jupyter_matlab_proxy.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-#
-# This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with:
-# "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-# "features": {
-#     "matlab": {
-#         "installJupyterMatlabProxy": true,
-#         "skipMATLABInstall": true
-#     }
-# }
-
-# This test can be run with the following command:
-#
-#    devcontainer features test \
-#                   --features matlab   \
-#                   --remote-user root \
-#                   --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
-#                   `pwd`
-# OR :
-# devcontainer features test -p `pwd` -f matlab --filter install_jupyter_matlab_proxy
-set -e
-
-# Optional: Import test library bundled with the devcontainer CLI
-source dev-container-features-test-lib
-
-# Feature-specific tests
-# The 'check' command comes from the dev-container-features-test-lib.
-# check <LABEL> <cmd> [args...]
-
-check "python3 is installed" python3 --version
-
-check "jupyter-matlab-proxy has been installed"  bash -c "python3 -m pip list | grep jupyter-matlab-proxy"
-
-check "jupyter-lab is installed" bash -c "jupyter-lab --version"
-
-check "matlab-proxy has been installed"  bash -c "python3 -m pip list | grep matlab-proxy"
-
-check "matlab-proxy-app is callable" bash -c "matlab-proxy-app -h"
-
-# Report results
-# If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
diff --git a/test/matlab/install_matlab_engine_for_python.sh b/test/matlab/install_matlab_engine_for_python.sh
deleted file mode 100644
index 2915dfa..0000000
--- a/test/matlab/install_matlab_engine_for_python.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-#
-# This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with
-# "image": "mathworks/matlab:R2024a",
-# "features": {
-#     "matlab": {
-#         "destination": "/opt/matlab/R2024a",
-#         "skipMATLABInstall": true,
-#         "installMatlabEngineForPython": true
-#     }
-# },
-# "containerUser": "matlab"
-
-# This test can be run with the following command:
-#
-#    devcontainer features test \
-#                   --features matlab   \
-#                   --remote-user root \
-#                   --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
-#                   `pwd`
-# OR:
-# devcontainer features test -p `pwd` -f matlab --filter install_matlab_engine_for_python --log-level debug
-
-set -e
-
-# Optional: Import test library bundled with the devcontainer CLI
-source dev-container-features-test-lib
-
-# Feature-specific tests
-# The 'check' command comes from the dev-container-features-test-lib.
-# check <LABEL> <cmd> [args...]
-
-check "python3 is installed" bash -c "python3 --version"
-
-check "matlabengine has been installed"  bash -c "python3 -m pip list | grep matlabengine"
-
-# Report results
-# If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
-
-
-#### Commands to test in container:
-# RELEASE=R2024a
-# RUN_INSTALL_SCRIPT="sudo env INSTALLMATLABENGINEFORPYTHON=true SKIPMATLABINSTALL=true _CONTAINER_USER=matlab \
-# _CONTAINER_USER_HOME=/home/matlab DESTINATION=/opt/matlab/${RELEASE^} RELEASE=${RELEASE} \
-# ~/install/install.sh "
-# TEST_IF_MATLABENGINE_INSTALLED="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-# docker run -it --rm --entrypoint /bin/sh -v `pwd`/src/matlab/:/home/matlab/install mathworks/matlab:${RELEASE} -c "$RUN_INSTALL_SCRIPT && $TEST_IF_MATLABENGINE_INSTALLED"
diff --git a/test/matlab/install_release_on_ubuntu.sh b/test/matlab/install_release_on_ubuntu.sh
deleted file mode 100644
index 99a4f1b..0000000
--- a/test/matlab/install_release_on_ubuntu.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-# Optional: Import test library bundled with the devcontainer CLI
-source dev-container-features-test-lib
-
-check "r2022b is installed" bash -c "cat /opt/matlab/R2022b/VersionInfo.xml | grep '<release>R2022b</release>'"
-
-# Report results
-# If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
\ No newline at end of file
diff --git a/test/matlab/install_release_on_ubuntu24.04.sh b/test/matlab/install_release_on_ubuntu24.04.sh
deleted file mode 100644
index 32fbd59..0000000
--- a/test/matlab/install_release_on_ubuntu24.04.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-## Execute the command below from the root folder of the feature to run this test in isolation:
-# devcontainer features test --features matlab --skip-autogenerated --filter install_release_on_ubuntu24.04
-
-# Optional: Import test library bundled with the devcontainer CLI
-source dev-container-features-test-lib
-
-check "r2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
-
-# Report results
-# If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
\ No newline at end of file
diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index b85e73f..f34afb8 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -1,21 +1,5 @@
 {
-    "install_release_on_ubuntu24.04": {
-        "image": "ubuntu:24.04",
-        "features": {
-            "matlab": {
-                "release": "r2025a"
-            }
-        }
-    },
-    "install_release_on_ubuntu": {
-        "image": "ubuntu:22.04",
-        "features": {
-            "matlab": {
-                "release": "r2022b"
-            }
-        }
-    },
-    "install_support_packages_as_container_user": {
+    "check_ubuntu": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "features": {
             "ghcr.io/devcontainers/features/common-utils:2": {
@@ -31,45 +15,16 @@
                 "installTools": false
             },
             "matlab": {
-                "release": "r2025a",
+                "release": "r2025b",
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
-                "installMatlabEngineForPython": true
-            }
-        },
-        "containerUser": "vscode"
-    },
-    "install_jupyter_matlab_proxy": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-        "features": {
-            "matlab": {
+                "installMatlabEngineForPython": true,
                 "installJupyterMatlabProxy": true,
-                "skipMATLABInstall": true
-            }
-        }
-    },
-    "start_in_matlab_proxy_desktop": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-        "features": {
-            "matlab": {
                 "startInDesktop": "test",
-                "networkLicenseManager": "123@abc.com",
-                "skipMATLABInstall": true
+                "networkLicenseManager": "123@abc.com"
             }
         },
         "containerUser": "vscode"
     },
-    "install_matlab_engine_for_python": {
-        "image": "mathworks/matlab:r2024b",
-        "features": {
-            "matlab": {
-                "release": "r2024b",
-                "destination": "/opt/matlab/R2024b",
-                "skipMATLABInstall": true,
-                "installMatlabEngineForPython": true
-            }
-        },
-        "containerUser": "matlab"
-    },
     "check_ubi9": {
         "image": "registry.access.redhat.com/ubi9/ubi:latest",
         "features": {
@@ -84,8 +39,10 @@
             "matlab": {
                 "release": "r2024a",
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
+                "installMatlabEngineForPython": true,
+                "installJupyterMatlabProxy": true,
                 "startInDesktop": "test",
-                "installJupyterMatlabProxy": true
+                "networkLicenseManager": "123@abc.com"
             }
         },
         "containerUser": "vscode"
diff --git a/test/matlab/start_in_matlab_proxy_desktop.sh b/test/matlab/start_in_matlab_proxy_desktop.sh
deleted file mode 100644
index 9f1e8f2..0000000
--- a/test/matlab/start_in_matlab_proxy_desktop.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-#
-# This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with
-# "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-# "features": {
-#     "matlab": {
-#         "startInDesktop": "test",
-#         "networkLicenseManager": "123@abc.com",
-#         "skipMATLABInstall": true
-#     }
-# },
-# "containerUser": "vscode"
-
-# This test can be run with the following command:
-#
-#    devcontainer features test \
-#                   --features matlab   \
-#                   --remote-user root \
-#                   --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
-#                   `pwd`
-# OR:
-# devcontainer features test -p `pwd` -f matlab --filter start_in_matlab_proxy_desktop
-
-set -e
-
-# Optional: Import test library bundled with the devcontainer CLI
-source dev-container-features-test-lib
-
-# Feature-specific tests
-# The 'check' command comes from the dev-container-features-test-lib.
-# check <LABEL> <cmd> [args...]
-
-check "python3 is installed" python3 --version
-
-check "matlab-proxy has been installed"  bash -c "python3 -m pip list | grep matlab-proxy"
-
-check "matlab-proxy-app is callable" bash -c "matlab-proxy-app -h"
-
-check "is startInDesktop marker file present" bash -c "ls ~/.teststartmatlabdesktop"
-
-check "NLM information is saved in bashrc " bash -c "echo $MLM_LICENSE_FILE | grep 123@abc.com "
-# Report results
-# If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults

From c9e1535c8f4dac524eceddf53fc288cc036c6941 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Thu, 18 Sep 2025 19:45:05 +0530
Subject: [PATCH 11/19] Update tests to use 25a until matlab engine for python
 releases support for 25b

---
 test/matlab/check_ubuntu.sh | 6 +++---
 test/matlab/scenarios.json  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/matlab/check_ubuntu.sh b/test/matlab/check_ubuntu.sh
index cc3d2f0..8a19076 100644
--- a/test/matlab/check_ubuntu.sh
+++ b/test/matlab/check_ubuntu.sh
@@ -4,7 +4,7 @@
 #-------------------------------------------------------------------------------------------------------------
 #
 # This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with the R2025b release, and a support package installed.
+# includes the 'matlab' feature with the R2025a release, and a support package installed.
 # Support package installation is special, because these packages need to be installed into
 # the end users HOME folder and not into the root users folders. Installing into root will
 # result in users being unable to access the Support Packages.
@@ -29,10 +29,10 @@ source dev-container-features-test-lib
 # check <LABEL> <cmd> [args...]
 
 # Verify that the right release is installed in the expected location.
-check "R2025b is installed" bash -c "cat /opt/matlab/R2025b/VersionInfo.xml | grep '<release>R2025b</release>'"
+check "R2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
 
 # Verify MATLAB_Support_Package_for_Android_Sensors is installed at the right place (ie: The home folder for the containerUser : vscode )
-check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025b/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
+check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025a/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
 
 check "is startInDesktop marker file present" bash -c "ls ~/.teststartmatlabdesktop"
 
diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index f34afb8..9346da9 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -15,7 +15,7 @@
                 "installTools": false
             },
             "matlab": {
-                "release": "r2025b",
+                "release": "r2025a",
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
                 "installMatlabEngineForPython": true,
                 "installJupyterMatlabProxy": true,

From eca4151ef9c900f84580ca609e65362e700e199e Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Thu, 18 Sep 2025 20:02:29 +0530
Subject: [PATCH 12/19] Use installJupyterLab

---
 test/matlab/scenarios.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index 9346da9..6d8cb83 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -19,6 +19,7 @@
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
                 "installMatlabEngineForPython": true,
                 "installJupyterMatlabProxy": true,
+                "installJupyterlab": true,
                 "startInDesktop": "test",
                 "networkLicenseManager": "123@abc.com"
             }
@@ -41,6 +42,7 @@
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
                 "installMatlabEngineForPython": true,
                 "installJupyterMatlabProxy": true,
+                "installJupyterlab": true,
                 "startInDesktop": "test",
                 "networkLicenseManager": "123@abc.com"
             }

From b0f8748fc35e2ccc49dff39f7ac5d1a4711e53d4 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 19 Sep 2025 12:56:08 +0530
Subject: [PATCH 13/19] Using 25b as the default, and updaterc fixes

---
 .devcontainer/matlab/install.sh      | 50 ++++++++++++++++++++--------
 src/matlab/devcontainer-feature.json |  2 +-
 src/matlab/install.sh                | 50 ++++++++++++++++++++--------
 test/matlab/scenarios.json           |  2 +-
 4 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/.devcontainer/matlab/install.sh b/.devcontainer/matlab/install.sh
index 692abf6..c192c77 100755
--- a/.devcontainer/matlab/install.sh
+++ b/.devcontainer/matlab/install.sh
@@ -17,8 +17,8 @@ set -eu -o pipefail
 
 ## Set defaults to all the options in the feature.
 
-# R2025a is the latest available release.
-RELEASE="${RELEASE:-"R2025a"}"
+# R2025b is the latest available release.
+RELEASE="${RELEASE:-"R2025b"}"
 PRODUCTS="${PRODUCTS:-"MATLAB"}"
 DOC="${DOC:-"false"}"
 INSTALLGPU="${INSTALLGPU:-"false"}"
@@ -53,13 +53,25 @@ export PIP_BREAK_SYSTEM_PACKAGES=1
 ### Helper Functions Begin ###
 export DEBIAN_FRONTEND=noninteractive
 
-function updaterc() {
-    echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-    if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-        echo -e "$1" >>/etc/bash.bashrc
+updaterc() {
+    local _bashrc
+    local _zshrc
+    IS_DEBIAN_OR_RHEL=$(ihf_is_debian_or_rhel)
+    case $IS_DEBIAN_OR_RHEL in
+        debian) echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
+            _bashrc=/etc/bash.bashrc
+            _zshrc=/etc/zsh/zshrc
+            ;;
+        rhel) echo "Updating /etc/bashrc and /etc/zshrc..."
+            _bashrc=/etc/bashrc
+            _zshrc=/etc/zshrc
+        ;;
+    esac
+    if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
+        echo -e "$1" >> ${_bashrc}
     fi
-    if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-        echo -e "$1" >>/etc/zsh/zshrc
+    if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
+        echo -e "$1" >> ${_zshrc}
     fi
 }
 
@@ -70,17 +82,24 @@ function install_xvfb() {
     fi
 }
 
+_INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=0
 function install_python_and_pip() {
-    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
-        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
-        ihf_remove_packages "python3-requests"
+    if [ "$_INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED" -eq 0 ]; then 
+        if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
+            # uninstalling python3-requests package as it cannot be updated by subsequent install command.
+            ihf_remove_packages "python3-requests"
+        fi
+        ihf_install_packages "python3 python3-pip"
+        _INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=1
+    else
+        echo "Python and PIP have been installed."
     fi
-    ihf_install_packages "python3 python3-pip"
 }
 
 _MATLAB_PROXY_HAS_BEEN_INSTALLED=0
 function install_matlab_proxy() {
     if [ "$_MATLAB_PROXY_HAS_BEEN_INSTALLED" -eq 0 ]; then 
+        install_python_and_pip
         install_xvfb
 
         $_PIP_INSTALL matlab-proxy
@@ -92,14 +111,18 @@ function install_matlab_proxy() {
 }
 
 function install_jupyter_matlab_proxy() {
+    install_python_and_pip
     $_PIP_INSTALL jupyter-matlab-proxy
 }
 
 function install_jupyterlab() {
+    install_python_and_pip
     $_PIP_INSTALL jupyterlab jupyter
 }
 
 function install_matlab_engine_for_python() {
+    install_python_and_pip
+
     # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
     # See: https://mathworks.com/support/requirements/python-compatibility.html
     declare -A matlabengine_map
@@ -168,8 +191,6 @@ fi
 MATLAB_FEATURE_INSTALL_TMPDIR=/tmp/matlab-feature-install
 mkdir -p $MATLAB_FEATURE_INSTALL_TMPDIR && pushd $MATLAB_FEATURE_INSTALL_TMPDIR
 
-install_python_and_pip
-
 # Install matlab-proxy if requested
 if [ "${INSTALLMATLABPROXY}" == "true" ]; then
     echo "Installing matlab-proxy"
@@ -221,6 +242,7 @@ fi
 
 # Update RC files with the provided license manager info
 if [ ! -z "${NETWORKLICENSEMANAGER}" -a "${NETWORKLICENSEMANAGER}" != " " ]; then
+    echo "Saving NLM info to bashrc and zshrc"
     updaterc "export MLM_LICENSE_FILE=${NETWORKLICENSEMANAGER}"
 fi
 
diff --git a/src/matlab/devcontainer-feature.json b/src/matlab/devcontainer-feature.json
index 40d192d..a37f32b 100644
--- a/src/matlab/devcontainer-feature.json
+++ b/src/matlab/devcontainer-feature.json
@@ -23,7 +23,7 @@
                 "R2019b",
                 "R2019a"
             ],
-            "default": "R2025a",
+            "default": "R2025b",
             "description": "MATLAB Release to install."
         },
         "products": {
diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index 692abf6..c192c77 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -17,8 +17,8 @@ set -eu -o pipefail
 
 ## Set defaults to all the options in the feature.
 
-# R2025a is the latest available release.
-RELEASE="${RELEASE:-"R2025a"}"
+# R2025b is the latest available release.
+RELEASE="${RELEASE:-"R2025b"}"
 PRODUCTS="${PRODUCTS:-"MATLAB"}"
 DOC="${DOC:-"false"}"
 INSTALLGPU="${INSTALLGPU:-"false"}"
@@ -53,13 +53,25 @@ export PIP_BREAK_SYSTEM_PACKAGES=1
 ### Helper Functions Begin ###
 export DEBIAN_FRONTEND=noninteractive
 
-function updaterc() {
-    echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-    if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-        echo -e "$1" >>/etc/bash.bashrc
+updaterc() {
+    local _bashrc
+    local _zshrc
+    IS_DEBIAN_OR_RHEL=$(ihf_is_debian_or_rhel)
+    case $IS_DEBIAN_OR_RHEL in
+        debian) echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
+            _bashrc=/etc/bash.bashrc
+            _zshrc=/etc/zsh/zshrc
+            ;;
+        rhel) echo "Updating /etc/bashrc and /etc/zshrc..."
+            _bashrc=/etc/bashrc
+            _zshrc=/etc/zshrc
+        ;;
+    esac
+    if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
+        echo -e "$1" >> ${_bashrc}
     fi
-    if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-        echo -e "$1" >>/etc/zsh/zshrc
+    if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
+        echo -e "$1" >> ${_zshrc}
     fi
 }
 
@@ -70,17 +82,24 @@ function install_xvfb() {
     fi
 }
 
+_INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=0
 function install_python_and_pip() {
-    if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
-        # uninstalling python3-requests package as it cannot be updated by subsequent install command.
-        ihf_remove_packages "python3-requests"
+    if [ "$_INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED" -eq 0 ]; then 
+        if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
+            # uninstalling python3-requests package as it cannot be updated by subsequent install command.
+            ihf_remove_packages "python3-requests"
+        fi
+        ihf_install_packages "python3 python3-pip"
+        _INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=1
+    else
+        echo "Python and PIP have been installed."
     fi
-    ihf_install_packages "python3 python3-pip"
 }
 
 _MATLAB_PROXY_HAS_BEEN_INSTALLED=0
 function install_matlab_proxy() {
     if [ "$_MATLAB_PROXY_HAS_BEEN_INSTALLED" -eq 0 ]; then 
+        install_python_and_pip
         install_xvfb
 
         $_PIP_INSTALL matlab-proxy
@@ -92,14 +111,18 @@ function install_matlab_proxy() {
 }
 
 function install_jupyter_matlab_proxy() {
+    install_python_and_pip
     $_PIP_INSTALL jupyter-matlab-proxy
 }
 
 function install_jupyterlab() {
+    install_python_and_pip
     $_PIP_INSTALL jupyterlab jupyter
 }
 
 function install_matlab_engine_for_python() {
+    install_python_and_pip
+
     # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
     # See: https://mathworks.com/support/requirements/python-compatibility.html
     declare -A matlabengine_map
@@ -168,8 +191,6 @@ fi
 MATLAB_FEATURE_INSTALL_TMPDIR=/tmp/matlab-feature-install
 mkdir -p $MATLAB_FEATURE_INSTALL_TMPDIR && pushd $MATLAB_FEATURE_INSTALL_TMPDIR
 
-install_python_and_pip
-
 # Install matlab-proxy if requested
 if [ "${INSTALLMATLABPROXY}" == "true" ]; then
     echo "Installing matlab-proxy"
@@ -221,6 +242,7 @@ fi
 
 # Update RC files with the provided license manager info
 if [ ! -z "${NETWORKLICENSEMANAGER}" -a "${NETWORKLICENSEMANAGER}" != " " ]; then
+    echo "Saving NLM info to bashrc and zshrc"
     updaterc "export MLM_LICENSE_FILE=${NETWORKLICENSEMANAGER}"
 fi
 
diff --git a/test/matlab/scenarios.json b/test/matlab/scenarios.json
index 6d8cb83..e9b4bd0 100644
--- a/test/matlab/scenarios.json
+++ b/test/matlab/scenarios.json
@@ -15,7 +15,7 @@
                 "installTools": false
             },
             "matlab": {
-                "release": "r2025a",
+                "release": "r2025b",
                 "products": "MATLAB MATLAB_Support_Package_for_Android_Sensors",
                 "installMatlabEngineForPython": true,
                 "installJupyterMatlabProxy": true,

From 4be8ef9767321de778435849c008aaf354b19c64 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 19 Sep 2025 13:29:29 +0530
Subject: [PATCH 14/19] updates for 25b

---
 .github/workflows/test.yaml | 3 +--
 test/matlab/check_ubuntu.sh | 6 +++---
 test/matlab/test.sh         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 73a0dca..4689167 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -16,9 +16,8 @@ jobs:
           - matlab
         baseImage:
           - debian:latest
-          # Update to ubuntu:latest when R2024b support for it has been released in matlab-deps
-          - ubuntu:22.04
           - mcr.microsoft.com/devcontainers/base:ubuntu
+          - registry.access.redhat.com/ubi9/ubi:latest
     steps:
       - uses: actions/checkout@v3
 
diff --git a/test/matlab/check_ubuntu.sh b/test/matlab/check_ubuntu.sh
index 8a19076..cc3d2f0 100644
--- a/test/matlab/check_ubuntu.sh
+++ b/test/matlab/check_ubuntu.sh
@@ -4,7 +4,7 @@
 #-------------------------------------------------------------------------------------------------------------
 #
 # This test file will be executed against one of the scenarios devcontainer.json test that
-# includes the 'matlab' feature with the R2025a release, and a support package installed.
+# includes the 'matlab' feature with the R2025b release, and a support package installed.
 # Support package installation is special, because these packages need to be installed into
 # the end users HOME folder and not into the root users folders. Installing into root will
 # result in users being unable to access the Support Packages.
@@ -29,10 +29,10 @@ source dev-container-features-test-lib
 # check <LABEL> <cmd> [args...]
 
 # Verify that the right release is installed in the expected location.
-check "R2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
+check "R2025b is installed" bash -c "cat /opt/matlab/R2025b/VersionInfo.xml | grep '<release>R2025b</release>'"
 
 # Verify MATLAB_Support_Package_for_Android_Sensors is installed at the right place (ie: The home folder for the containerUser : vscode )
-check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025a/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
+check "support package is installed" bash -c "cat /home/vscode/Documents/MATLAB/SupportPackages/R2025b/ssiSearchFolders | head -1 | grep 'toolbox/matlab/hardware/shared/hwsdk'"
 
 check "is startInDesktop marker file present" bash -c "ls ~/.teststartmatlabdesktop"
 
diff --git a/test/matlab/test.sh b/test/matlab/test.sh
index cbe3fee..c237f96 100644
--- a/test/matlab/test.sh
+++ b/test/matlab/test.sh
@@ -56,7 +56,7 @@ source dev-container-features-test-lib
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib. Syntax is...
 # check <LABEL> <cmd> [args...]
-check "R2025a is installed" bash -c "cat /opt/matlab/R2025a/VersionInfo.xml | grep '<release>R2025a</release>'"
+check "R2025b is installed" bash -c "cat /opt/matlab/R2025b/VersionInfo.xml | grep '<release>R2025b</release>'"
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.

From 71805f7deb6e82269b9ebafc1b364829e562712b Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 19 Sep 2025 15:45:17 +0530
Subject: [PATCH 15/19] Remove local devcontainer configurations for testing

---
 .devcontainer/basic/devcontainer.json         |  39 --
 .../matlab-codespaces/devcontainer.json       |  68 ----
 .devcontainer/matlab/README.md                |  40 --
 .devcontainer/matlab/TODO.md                  |  83 -----
 .../matlab/devcontainer-feature.json          | 115 ------
 .../matlab/install-helper-functions.sh        | 321 ----------------
 .devcontainer/matlab/install-matlab-deps.sh   |  74 ----
 .devcontainer/matlab/install.sh               | 342 ------------------
 .devcontainer/matlab/tests.sh                 |  25 --
 9 files changed, 1107 deletions(-)
 delete mode 100644 .devcontainer/basic/devcontainer.json
 delete mode 100644 .devcontainer/matlab-codespaces/devcontainer.json
 delete mode 100644 .devcontainer/matlab/README.md
 delete mode 100644 .devcontainer/matlab/TODO.md
 delete mode 100644 .devcontainer/matlab/devcontainer-feature.json
 delete mode 100755 .devcontainer/matlab/install-helper-functions.sh
 delete mode 100755 .devcontainer/matlab/install-matlab-deps.sh
 delete mode 100755 .devcontainer/matlab/install.sh
 delete mode 100755 .devcontainer/matlab/tests.sh

diff --git a/.devcontainer/basic/devcontainer.json b/.devcontainer/basic/devcontainer.json
deleted file mode 100644
index 5311031..0000000
--- a/.devcontainer/basic/devcontainer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    // "image": "ubuntu:24.04",
-    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-    "remoteUser": "vscode",
-    // "image": "mathworks/matlab:r2025a",
-    // The problem with mathworks/matlab is matlab-proxy is already installed by pipx! What do we do here?
-    // "containerUser": "matlab",
-    "features": {
-        "../matlab": {
-            "release": "r2025a",
-            "skipMATLABInstall": false,
-            "installMatlabProxy": true,
-            "installJupyterMatlabProxy": true,
-            "installMatlabEngineForPython": true,
-            "installJupyterLab": true
-        }
-    },
-    // Configure VSCode Extensions
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "MathWorks.language-matlab",
-                "ms-toolsai.jupyter",
-                "ms-python.python"
-            ],
-            "settings": {
-                "MATLAB.signIn": true,
-                // "MATLAB.installPath": "/opt/matlab/R2025a",
-                // "python.venvPath": "/opt/pipx/venvs/",
-                // Marks MATLAB Kernel as a trusted source
-                "jupyter.kernels.trusted": [
-                    "/usr/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json",
-                    // "opt/pipx/venvs/matlab-proxy/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json"
-                ]
-            }
-        }
-    },
-    "onCreateCommand": "echo =IAMUSER===$(whoami)===="
-}
\ No newline at end of file
diff --git a/.devcontainer/matlab-codespaces/devcontainer.json b/.devcontainer/matlab-codespaces/devcontainer.json
deleted file mode 100644
index 71361b8..0000000
--- a/.devcontainer/matlab-codespaces/devcontainer.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  /* This DevContainer configuration demonstrates
-      1. Building image using Dev Container Features
-      2. Installation of MATLAB Integration for Jupyter & JupyterLab  
-      3. Configuration of VSCode environment for following modes of access:
-          a. MATLAB in a Browser
-          b. Directly from VSCode, using the MATLAB extension for VSCode
-          c. Using Jupyter Notebooks in VSCode
-          d. Start Codespace in Jupyter
-  See: https://containers.dev/implementors/features/
-  */
-  "name": "Built using Dev Container Features",
-  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-  "features": {
-    // "ghcr.io/mathworks/devcontainer-features/matlab": {
-    "../matlab": {
-      // For more options, See: https://github.com/mathworks/devcontainer-features/tree/main/src/matlab
-      "release": "r2025a",
-      "products": "MATLAB Symbolic_Math_Toolbox",
-      "installMatlabProxy": "true",
-      "startInDesktop": "true",
-      "installJupyterMatlabProxy": "true",
-      "installMatlabEngineForPython": "true"
-    }
-    // "ghcr.io/devcontainers/features/python": {
-    //   "version": "os-provided",
-    //   "installJupyterlab": true,
-    //   "configureJupyterlabAllowOrigin": "*"
-    // }
-  },
-  "portsAttributes": {
-    "8888": {
-      "label": "MATLAB",
-      "onAutoForward": "openPreview"
-    }
-  },
-  "containerEnv": {
-    "MWI_APP_PORT": "8888",
-    "MWI_ENABLE_TOKEN_AUTH": "False",
-    // Configure MATLAB's startup folder
-    "MATLAB_USERWORKDIR": "${containerWorkspaceFolder}",
-    "MATLAB_USE_USERWORK": "1",
-    // Enable embedding the desktop into VSCode's Simple Browser
-    "MWI_CUSTOM_HTTP_HEADERS": "{\"Content-Security-Policy\": \"frame-ancestors *\"}"
-  },
-  // Configure VSCode Extensions
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "MathWorks.language-matlab",
-        "ms-toolsai.jupyter",
-        "ms-python.python"
-      ],
-      "settings": {
-        "MATLAB.signIn": true,
-        // Marks MATLAB Kernel as a trusted source
-        "jupyter.kernels.trusted": [
-          "/usr/share/jupyter/kernels/jupyter_matlab_kernel/kernel.json"
-        ]
-      }
-    }
-  },
-  // "hostRequirements": {
-  //   "cpus": 4
-  // },
-  // Need to specify a user to use the startInDesktop feature.
-  "containerUser": "vscode"
-}
\ No newline at end of file
diff --git a/.devcontainer/matlab/README.md b/.devcontainer/matlab/README.md
deleted file mode 100644
index 695b4ac..0000000
--- a/.devcontainer/matlab/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-# MATLAB (matlab)
-
-Installs MATLAB with supporting packages and tools.
-
-## Example Usage
-
-```json
-"features": {
-    "ghcr.io/mathworks/devcontainer-features/matlab:0": {}
-}
-```
-
-## Options
-
-| Options Id | Description | Type | Default Value |
-|-----|-----|-----|-----|
-| release | MATLAB Release to install. | string | R2024b |
-| products | Products to install, specified as a list of space-separated product names.</br> For details of products, see [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md#product-installation-options). | string | MATLAB |
-| doc | Flag to install documentation and examples (R2022b and earlier releases). | boolean | false |
-| installGpu | Skips installation of GPU libraries when you install Parallel Computing Toolbox (R2023a and later releases). | boolean | false |
-| destination | Full path to the installation destination folder. Default: /opt/matlab/${RELEASE^} | string | - |
-| installMatlabProxy | Installs matlab-proxy and its dependencies (R2020b and later releases). | boolean | false |
-| installJupyterMatlabProxy | Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases). | boolean | false |
-| installMatlabEngineForPython | Installs the MATLAB Engine for Python if the destination option is set correctly. | boolean | false |
-| startInDesktop | Starts matlab-proxy when container starts. | string | false |
-| networkLicenseManager | MATLAB will use the specified Network License Manager. | string | - |
-| skipMATLABInstall | Set to true if you do not want to install MATLAB, for example if you only want to install `matlab-proxy` or `jupyter-matlab-proxy`. | boolean | false |
-
-## Customizations
-
-### VS Code Extensions
-
-- `MathWorks.language-matlab`
-
-
-
----
-
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/mathworks/devcontainer-features/blob/main/src/matlab/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/.devcontainer/matlab/TODO.md b/.devcontainer/matlab/TODO.md
deleted file mode 100644
index d318a1e..0000000
--- a/.devcontainer/matlab/TODO.md
+++ /dev/null
@@ -1,83 +0,0 @@
-
-# How to install matlab-proxy, jupyter-matlab-proxy or the MATLAB Engine for python 3.12?
-
-- The base install.sh script will install PIPX.
-- The onCreateCommand lifecycle hook, can then call another script to install python packages using PIPX into a single environment.
-- The script will need to be placed into a location that the user can access later on!
-    - Assumptions:
-        * The script has access to the configuration in the JSON file, so that it knows which packages to install.
-        * The script is being run as the end user of the container, only then will the installations by PIPX be visible and on PATH for that user.
-        
-## How to do it?
-
-- Create a base environment, lets say matlab-proxy
-```bash
-pipx install matlab-proxy
-```
-- Then based on other feature requirements, install the others while including their installed apps
-```bash
-pipx inject --include-apps --include-deps matlab-proxy jupyterlab jupyter-matlab-proxy
-```
-
-using pipx would:
-1. Make sure that matlab-proxy-app, is on the path.
-2. However, generic python packages like matlabengine & jupyter-matlab-proxy will not be available to users
-
-What is the user expectation?
-* When the codespace/devcontainer uses the feature:
-    a. The environment is already configured with all the things he needs.
-
-* E1: He expects to have the python interpreter setup
-* E2: He expects to have matlabengine available for use with the python interpreter that is setup
-* E3: If Jupyterlab is available, then he expects to see the MATLAB Integration for Jupyter to show up
-* E4: He expects to have the matlab-proxy-app executable available to call
-
-Strategy 1: PIPX to install MP, JMP + Jupyter, ME into a single PIPX MATLAB VENV
-
-Expectations met: E4, E3, E2(only if he uses the notebook)
-Expectations failed: E1 & E2
-
-Strategy 2: Strategy 1 + Activate the PIPX MATLAB VENV
-
-NOTES:
-* PIPX is a tool to install command line utilities, and not meant for environment management.
-* Renaming of environments created using PIPX is directly supported. 
-    - one could rename the 
-
-
-# Attempt 1:
-Using the --global flag or equivalent option in PIPX along with ensureonpath as root user.
-This allows for the executables to be available for the logged in user.
-
-PIPX is anyways not meant to be a solution for extensibility of packages.
-
-## Behavior
-1. executables are found on path by end user.
-2. there may be shadowing of executables. ex: mathworks/matlab installs MPA, and that executable sits higher up on the path than the one installed by the devcontainer feature.
-3. 
-
-## To Check:
-See if the notebook can be used from vscode.
-
-## Issues found:
-1. mathworks/matlab:r2025a had issues with user privileges. The mounted repostiory files could not be used.
-    * There may be a way to get past this in the devcontainer configuration files.
-
-2. 
-
-## Discoveries
-1. MATLAB Engine for Python was able to render the login screens when using `-licmode onlinelicensing`
-   The environment was: A Devcontainer running WSL2 on Windows  
-# Thoughts
-
-## what are the goals of the devcontainer feature.
-* Make it easy to install MATLAB into devcontainers
-* Make it easier to use MATLAB in the containerized environment
-
-* What are the ways in which people use MATLAB:
- 1. command line
- 2. VSCode editor run and edit
- 3. Jupyter notebooks in vscode.
- 4. Jupyter executable
- 5. Desktop MATLAB 
- 6. 
diff --git a/.devcontainer/matlab/devcontainer-feature.json b/.devcontainer/matlab/devcontainer-feature.json
deleted file mode 100644
index 40d192d..0000000
--- a/.devcontainer/matlab/devcontainer-feature.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "name": "MATLAB",
-    "id": "matlab",
-    "version": "0.3.0",
-    "description": "Installs MATLAB with supporting packages and tools.",
-    "documentationURL": "https://github.com/mathworks/devcontainer-features",
-    "options": {
-        "release": {
-            "type": "string",
-            "proposals": [
-                "R2025b",
-                "R2025a",
-                "R2024b",
-                "R2024a",
-                "R2023b",
-                "R2023a",
-                "R2022b",
-                "R2022a",
-                "R2021b",
-                "R2021a",
-                "R2020b",
-                "R2020a",
-                "R2019b",
-                "R2019a"
-            ],
-            "default": "R2025a",
-            "description": "MATLAB Release to install."
-        },
-        "products": {
-            "type": "string",
-            "proposals": [
-                "MATLAB",
-                "MATLAB Simulink Signal_Processing_Toolbox"
-            ],
-            "default": "MATLAB",
-            "description": "Products to install, specified as a list of space-separated product names.</br> For details of products, see [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md#product-installation-options)."
-        },
-        "doc": {
-            "type": "boolean",
-            "default": false,
-            "description": "Flag to install documentation and examples (R2022b and earlier releases)."
-        },
-        "installGpu": {
-            "type": "boolean",
-            "default": false,
-            "description": "Skips installation of GPU libraries when you install Parallel Computing Toolbox (R2023a and later releases)."
-        },
-        "destination": {
-            "type": "string",
-            "default": "",
-            "description": "Full path to the installation destination folder. Default: /opt/matlab/${RELEASE^}"
-        },
-        "installMatlabProxy": {
-            "default": false,
-            "description": "Installs matlab-proxy and its dependencies (R2020b and later releases).",
-            "type": "boolean"
-        },
-        "installJupyterMatlabProxy": {
-            "default": false,
-            "description": "Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases).",
-            "type": "boolean"
-        },
-        "installJupyterLab": {
-            "default": false,
-            "description": "Installs jupyterlab",
-            "type": "boolean"
-        },
-        "installMatlabEngineForPython": {
-            "default": false,
-            "description": "Installs the MATLAB Engine for Python if the destination option is set correctly.",
-            "type": "boolean"
-        },
-        "startInDesktop": {
-            "default": "false",
-            "description": "Starts matlab-proxy when container starts.",
-            "type": "string",
-            "enum": [
-                "true",
-                "false",
-                "test"
-            ]
-        },
-        "networkLicenseManager": {
-            "type": "string",
-            "proposals": [
-                "port@hostname"
-            ],
-            "default": "",
-            "description": "MATLAB will use the specified Network License Manager."
-        },
-        "skipMATLABInstall": {
-            "type": "boolean",
-            "default": false,
-            "description": "Set to true if you do not want to install MATLAB, for example if you only want to install `matlab-proxy` or `jupyter-matlab-proxy`."
-        }
-    },
-    "postStartCommand": "( ls ~/.startmatlabdesktop >> /dev/null 2>&1 && env MWI_APP_PORT=8888 matlab-proxy-app 2>/dev/null ) || echo 'Will not start matlab-proxy-app...'",
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "MathWorks.language-matlab"
-            ],
-            "settings": {
-                "MATLAB.indexWorkspace": true,
-                "MATLAB.signIn": true,
-                "MATLAB.matlabConnectionTiming": "onDemand",
-                "MATLAB.telemetry": true
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils",
-        "ghcr.io/devcontainers/features/python"
-    ]
-}
\ No newline at end of file
diff --git a/.devcontainer/matlab/install-helper-functions.sh b/.devcontainer/matlab/install-helper-functions.sh
deleted file mode 100755
index 0e8b07a..0000000
--- a/.devcontainer/matlab/install-helper-functions.sh
+++ /dev/null
@@ -1,321 +0,0 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-# Helpers functions to encapsulate OS specific installation
-
-set -eu -o pipefail
-
-# Global variable to store the last error message.
-LAST_ERR=""
-
-function _ihf_print_installation_status_on_exit() {
-    if [ $? -eq 0 ]; then
-        printf "Done!\n"
-    else
-        printf "$LAST_ERR \nFailed to install for MATLAB ${MATLAB_RELEASE:-undefined} on ${PRETTY_NAME:-undefined}.\nTo debug, call script with SHELLOPTS=xtrace \n"
-    fi
-}
-
-trap _ihf_print_installation_status_on_exit EXIT
-
-function ihf_print_and_exit() {
-    LAST_ERR="$1"
-    printf "$LAST_ERR, exiting...\n"
-    exit 1
-}
-
-function ihf_get_matlab_deps_os() {
-    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
-    local MATLAB_DEPS_OS_VERSION="undefined"
-    # get os-release variables
-    . /etc/os-release
-    
-    case ${LINUX_DISTRO} in
-        debian)
-            if [[ "${ID}" == "ubuntu" ]]; then
-                MATLAB_DEPS_OS_VERSION=${ID}${VERSION_ID}
-            elif [[ "${ID}" == "debian" ]]; then
-                local UBUNTU_VERSION_ID=${VERSION_ID/11/20.04}
-                UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/12/22.04}
-                UBUNTU_VERSION_ID=${UBUNTU_VERSION_ID/13/24.04}
-                MATLAB_DEPS_OS_VERSION=ubuntu${UBUNTU_VERSION_ID}
-            fi
-        ;;
-        rhel)
-            if [[ "${ID}" == "rhel" ]]; then
-                # This link lists the Fedora base image that a particular RHEL version depends on:
-                # https://docs.fedoraproject.org/en-US/quick-docs/fedora-and-red-hat-enterprise-linux/
-                # UBI 9 -> Fedora 34
-                # UBI 8 -> Fedora 28
-                # The End of life for these distributions can be found here:
-                # https://endoflife.date/rhel
-                # https://endoflife.date/fedora
-                local SUPPORTED_MAJOR_VERSION="8 9"
-                local MATLAB_DEPS_OS_VERSION="ubi"
-                local MAJOR_VERSION_ID=$(echo $VERSION_ID | cut -d '.' -f 1)
-                local MAJOR_VERSION_ID_REGEX="\<${MAJOR_VERSION_ID}\>"
-                if [[ ${SUPPORTED_MAJOR_VERSION[@]} =~ ${MAJOR_VERSION_ID_REGEX} ]]; then
-                    MATLAB_DEPS_OS_VERSION=${MATLAB_DEPS_OS_VERSION}${MAJOR_VERSION_ID}
-                else
-                    ihf_print_and_exit "Un-supported version ${MAJOR_VERSION_ID}"
-                fi
-                
-                elif [[ "${ID}" == "fedora" ]]; then
-                # Assuming UBI 9 as fedora 28 was at end of life in 2018.
-                MATLAB_DEPS_OS_VERSION="ubi9"
-            else
-                ihf_print_and_exit "Unsupported OS ${ID}"
-            fi
-        ;;
-    esac
-    
-    #return value
-    echo $MATLAB_DEPS_OS_VERSION
-    
-}
-
-function _ihf_get_additional_repos (){
-    . /etc/os-release
-    
-    local _DISTRO=$(ihf_is_debian_or_rhel)
-    # To find some devel packages, some rhel need to enable specific extra repos, but not on RedHat ubi images...
-    local INSTALL_CMD_ADDL_REPOS=""
-    if [ ${_DISTRO} = "rhel" ] && [ ${ID} != "rhel" ]; then
-        local MAJOR_VERSION_ID=$(echo $VERSION_ID | cut -d '.' -f 1)
-        if [ ${MAJOR_VERSION_ID} = "8" ]; then
-            INSTALL_CMD_ADDL_REPOS="--enablerepo powertools"
-            elif [ ${MAJOR_VERSION_ID} = "9" ]; then
-            INSTALL_CMD_ADDL_REPOS="--enablerepo crb"
-        fi
-    fi
-    
-    echo $INSTALL_CMD_ADDL_REPOS
-}
-
-
-function ihf_get_pkg_mgr_cmd() {
-    local PKG_MGR_CMD=""
-    if type apt-get >/dev/null 2>&1; then
-        PKG_MGR_CMD=apt-get
-        elif type microdnf >/dev/null 2>&1; then
-        PKG_MGR_CMD=microdnf
-        elif type dnf >/dev/null 2>&1; then
-        PKG_MGR_CMD=dnf
-    else
-        PKG_MGR_CMD=yum
-    fi
-    
-    echo $PKG_MGR_CMD
-}
-
-function ihf_get_install_cmd() {
-    local PKG_MGR_CMD=$(ihf_get_pkg_mgr_cmd)
-    local INSTALL_CMD=""
-    if type apt-get >/dev/null 2>&1; then
-        INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
-        elif type microdnf >/dev/null 2>&1; then
-        INSTALL_CMD="${PKG_MGR_CMD} $(_ihf_get_additional_repos) -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
-        elif type dnf >/dev/null 2>&1; then
-        INSTALL_CMD="${PKG_MGR_CMD} $(_ihf_get_additional_repos) -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
-    else
-        INSTALL_CMD="${PKG_MGR_CMD} $(_ihf_get_additional_repos) -y install --disableplugin=subscription-manager --noplugins --setopt=install_weak_deps=0"
-    fi
-    
-    echo $INSTALL_CMD
-}
-
-function ihf_get_remove_cmd() {
-    local PKG_MGR_CMD=$(ihf_get_pkg_mgr_cmd)
-    local REMOVE_CMD="${PKG_MGR_CMD} -y remove"
-    
-    echo $REMOVE_CMD
-}
-
-# returns "true/false" string if MATLAB_RELEASE is valid
-function ihf_is_valid_matlab_release() {
-    # List of supported MATLAB_RELEASE values
-    local _SUPPORTED_MATLAB_RELEASES=("R2025b" "R2025a" "R2024b" "R2024a" "R2023b" "R2023a" "R2022b" "R2022a" "R2021b" "R2021a" "R2020b" "R2020a" "R2019b" "R2019a")
-    
-    ## Validate MATLAB_RELEASE
-    if [ -z "$MATLAB_RELEASE" ]; then
-        echo "false"
-    else
-        # checking if valid matlab release configuration
-        local _RELEASE_REGEX="\<${MATLAB_RELEASE}\>"
-        if [[ ${_SUPPORTED_MATLAB_RELEASES[@]} =~ ${_RELEASE_REGEX} ]]; then
-            echo "true"
-        else
-            echo "false"
-        fi
-    fi
-}
-
-function ihf_is_debian_or_rhel() {
-    . /etc/os-release
-    
-    if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
-        echo "debian"
-        elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
-        echo "rhel"
-    else
-        ihf_print_and_exit "Linux distro ${ID} not supported."
-    fi
-}
-
-
-function ihf_is_debian_13 {
-    . /etc/os-release
-    if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" = "13" ]; then
-        echo "true"
-    else
-        echo "false"
-    fi
-}
-
-function ihf_clean_up() {
-    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
-    case ${LINUX_DISTRO} in
-        debian)
-            rm -rf /var/lib/apt/lists/*
-            apt-get clean && apt-get autoremove
-        ;;
-        rhel)
-            rm -rf /var/cache/dnf/* /var/cache/yum/*
-            rm -rf /tmp/yum.log
-            yum --disableplugin=subscription-manager clean all -y
-        ;;
-    esac
-}
-
-ihf_updaterc() {
-    local _bashrc
-    local _zshrc
-    if [ "${UPDATE_RC}" = "true" ]; then
-        case $ADJUSTED_ID in
-            debian)
-                echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-                _bashrc=/etc/bash.bashrc
-                _zshrc=/etc/zsh/zshrc
-            ;;
-            rhel)
-                echo "Updating /etc/bashrc and /etc/zshrc..."
-                _bashrc=/etc/bashrc
-                _zshrc=/etc/zshrc
-            ;;
-        esac
-        if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
-            echo -e "$1" >>${_bashrc}
-        fi
-        if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
-            echo -e "$1" >>${_zshrc}
-        fi
-    fi
-}
-
-function ihf_pkg_mgr_update() {
-    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
-    local PKG_MGR_CMD=$(ihf_get_pkg_mgr_cmd)
-    echo "UPDATING using $PKG_MGR_CMD"
-    case $LINUX_DISTRO in
-        debian)
-            echo "Running apt-get update..."
-            ${PKG_MGR_CMD} update -y
-        ;;
-        rhel)
-            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
-                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
-                    echo "Running ${PKG_MGR_CMD} makecache ..."
-                    ${PKG_MGR_CMD} makecache
-                fi
-            else
-                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
-                    echo "Running ${PKG_MGR_CMD} check-update ..."
-                    set +e
-                    ${PKG_MGR_CMD} check-update
-                    rc=$?
-                    if [ $rc != 0 ] && [ $rc != 100 ]; then
-                        exit 1
-                    fi
-                    set -e
-                fi
-            fi
-        ;;
-    esac
-}
-
-# Checks if packages are installed and installs them if not
-function ihf_install_packages() {
-    
-    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
-    local INSTALL_CMD=$(ihf_get_install_cmd)
-    echo "install command: $INSTALL_CMD"
-    echo "INSTALLING $@"
-    case ${LINUX_DISTRO} in
-        debian)
-            if ! dpkg -s "$@" >/dev/null 2>&1; then
-                ihf_pkg_mgr_update && \
-                ${INSTALL_CMD} $@
-            fi
-        ;;
-        rhel)
-            if ! rpm -q "$@" >/dev/null 2>&1; then
-                ihf_pkg_mgr_update
-                ${INSTALL_CMD} $@
-            fi
-        ;;
-    esac
-}
-
-function ihf_remove_packages() {
-    
-    local LINUX_DISTRO=$(ihf_is_debian_or_rhel)
-    local REMOVE_CMD=$(ihf_get_remove_cmd)
-    echo "remove command: $REMOVE_CMD"
-    echo "REMOVING: $@"
-    case ${LINUX_DISTRO} in
-        debian)
-            if dpkg -s "$@" >/dev/null 2>&1; then
-                ${REMOVE_CMD} $@
-            fi
-        ;;
-        rhel)
-            if rpm -q "$@" >/dev/null 2>&1; then
-                ${REMOVE_CMD} $@
-            fi
-        ;;
-    esac
-}
-
-function test_script() {
-    # Only run tests if this script is called directly
-    # These will not run if this script is sourced from another file
-    if [ $(basename "$0") == "install-helper-functions.sh" ]; then
-        echo "=============Starting test"
-        echo "me=$(basename "$0")"
-        
-        echo "testing update"
-        ihf_pkg_mgr_update
-        
-        
-        MATLAB_RELEASE=R2024a
-        is_release_valid=$(ihf_is_valid_matlab_release)
-        echo "Is $MATLAB_RELEASE valid? Ans: $is_release_valid"
-        
-        MATLAB_RELEASE=R2023bd
-        echo "Is $MATLAB_RELEASE valid? Ans: $(ihf_is_valid_matlab_release)"
-        
-        LINUX_DISTRO=$(ihf_is_debian_or_rhel)
-        echo "LINUX_DISTRO: $LINUX_DISTRO"
-        
-        matlab_deps_os=$(ihf_get_matlab_deps_os)
-        echo "The MATLAB deps to install is: $matlab_deps_os"
-        
-        install_cmd=$(ihf_get_install_cmd)
-        echo "install_cmd: $install_cmd"
-        
-        echo "Finished test=============="
-    fi
-}
-
-test_script
diff --git a/.devcontainer/matlab/install-matlab-deps.sh b/.devcontainer/matlab/install-matlab-deps.sh
deleted file mode 100755
index bc2e57d..0000000
--- a/.devcontainer/matlab/install-matlab-deps.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-# This script install the OS dependencies required by MATLAB for the release specified in the
-# environment variable MATLAB_RELEASE on any linux OS that is dervied from Ubuntu or RHEL
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-
-set -eu -o pipefail
-# exits on an error (-e, equivalent to -o errexit);
-# exits on an undefined variable (-u, equivalent to -o nounset);
-# exits on an error in piped-together commands (-o pipefail)
-
-# Uncomment to debug:
-# set -x
-# Or, set environment variable "SHELLOPTS=xtrace" before starting script
-
-if [ $(basename "$0") != "install-matlab-deps.sh" ]; then
-    _SCRIPT_LOCATION="$1"
-    source ${_SCRIPT_LOCATION}/install-helper-functions.sh
-else
-    source $(dirname "$0")/install-helper-functions.sh
-fi
-
-
-# Verify if valid MATLAB_RELEASE
-if [ "$(ihf_is_valid_matlab_release)" == "false" ]; then
-    ihf_print_and_exit "Invalid or Unsupported MATLAB_RELEASE: $MATLAB_RELEASE "
-fi
-
-function print_os_info(){
-    . /etc/os-release
-    echo "Running install-matlab-deps script on: $PRETTY_NAME"
-    echo "ID=$ID , VERSION_ID=$VERSION_ID, for MATLAB_RELEASE=$MATLAB_RELEASE"
-}
-
-function get_prerequisite_pkgs() {
-    # Returns the list of pre-requisite packages required to install matlab-deps
-    echo "wget unzip ca-certificates"
-}
-
-function get_base_dependencies_list() {
-    local MATLAB_DEPS_OS_VERSION=$(ihf_get_matlab_deps_os)
-    local BASE_DEPS_URL=https://raw.githubusercontent.com/mathworks-ref-arch/container-images/main/matlab-deps/${MATLAB_RELEASE,}/${MATLAB_DEPS_OS_VERSION}/base-dependencies.txt
-    # Get matlab_deps - if this fails, then we aren't on a supported os
-    local PKGS=$(wget -qO- ${BASE_DEPS_URL})
-    # if Debian 13, then remove packages which have dpdk in their name
-    if [ "$(ihf_is_debian_13)" == "true" ]; then
-        PKGS=$(echo $PKGS | tr ' ' '\n' | grep -v 'dpdk' | tr '\n' ' ')
-    fi
-    if [ -z "$PKGS" ]; then
-        ihf_print_and_exit "${MATLAB_DEPS_OS_VERSION} is not a supported OS for MATLAB ${MATLAB_RELEASE} ."
-    fi
-    echo $PKGS
-}
-
-function install_matlab_deps() {
-    local MATLAB_DEPS_OS_VERSION=$(ihf_get_matlab_deps_os)
-    
-    print_os_info
-    
-    local PREREQ_PACKAGES=$(get_prerequisite_pkgs)
-    
-    ihf_install_packages "$PREREQ_PACKAGES"
-    
-    echo "Get list of dependencies from ${MATLAB_RELEASE}/${MATLAB_DEPS_OS_VERSION}/base-dependencies.txt"
-    local BASE_DEPS_PKGS=$(get_base_dependencies_list)
-    ihf_install_packages "$BASE_DEPS_PKGS"
-    
-    ihf_clean_up
-    # Return 0 to indicate success!
-    return 0
-}
-install_matlab_deps
-
diff --git a/.devcontainer/matlab/install.sh b/.devcontainer/matlab/install.sh
deleted file mode 100755
index c192c77..0000000
--- a/.devcontainer/matlab/install.sh
+++ /dev/null
@@ -1,342 +0,0 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright 2024-2025 The MathWorks, Inc.
-#-------------------------------------------------------------------------------------------------------------
-# NOTE: The 'install.sh' entrypoint script is always executed as the root user.
-
-set -eu -o pipefail
-# exits on an error (-e, equivalent to -o errexit);
-# exits on an undefined variable (-u, equivalent to -o nounset);
-# exits on an error in piped-together commands (-o pipefail)
-
-# Uncomment to debug:
-# set -x
-# Or, set environment variable "SHELLOPTS=xtrace" before starting script
-
-### Variable Declaration Begin ###
-
-## Set defaults to all the options in the feature.
-
-# R2025b is the latest available release.
-RELEASE="${RELEASE:-"R2025b"}"
-PRODUCTS="${PRODUCTS:-"MATLAB"}"
-DOC="${DOC:-"false"}"
-INSTALLGPU="${INSTALLGPU:-"false"}"
-DESTINATION="${DESTINATION:-"/opt/matlab/${RELEASE^}"}"
-INSTALLMATLABPROXY="${INSTALLMATLABPROXY:-"false"}"
-INSTALLJUPYTERMATLABPROXY="${INSTALLJUPYTERMATLABPROXY:-"false"}"
-INSTALLJUPYTERLAB="${INSTALLJUPYTERLAB:-"false"}"
-INSTALLMATLABENGINEFORPYTHON="${INSTALLMATLABENGINEFORPYTHON:-"false"}"
-STARTINDESKTOP="${STARTINDESKTOP:-"false"}"
-NETWORKLICENSEMANAGER="${NETWORKLICENSEMANAGER:-" "}"
-SKIPMATLABINSTALL="${SKIPMATLABINSTALL:-"false"}"
-
-MATLAB_RELEASE="${RELEASE^}"
-MATLAB_PRODUCT_LIST="${PRODUCTS}"
-MATLAB_INSTALL_LOCATION="${DESTINATION}"
-
-echo "MATLAB_INSTALL_LOCATION: ${MATLAB_INSTALL_LOCATION}"
-
-# Needed by the MATLAB Engine for Python.
-# Appends to any existing value of LD_LIBRARY_PATH the path where MATLAB is installed by this script.
-_LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"${LD_LIBRARY_PATH}:"}${MATLAB_INSTALL_LOCATION}/bin/glnxa64"
-
-_CONTAINER_USER_HOME="${_CONTAINER_USER_HOME:-"undefined"}"
-_CONTAINER_USER="${_CONTAINER_USER:-"undefined"}"
-
-_SCRIPT_LOCATION=$(dirname $(readlink -f "$0"))
-
-_PIP_INSTALL="python3 -m pip install"
-export PIP_BREAK_SYSTEM_PACKAGES=1
-
-### Variable Declaration End ###
-### Helper Functions Begin ###
-export DEBIAN_FRONTEND=noninteractive
-
-updaterc() {
-    local _bashrc
-    local _zshrc
-    IS_DEBIAN_OR_RHEL=$(ihf_is_debian_or_rhel)
-    case $IS_DEBIAN_OR_RHEL in
-        debian) echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-            _bashrc=/etc/bash.bashrc
-            _zshrc=/etc/zsh/zshrc
-            ;;
-        rhel) echo "Updating /etc/bashrc and /etc/zshrc..."
-            _bashrc=/etc/bashrc
-            _zshrc=/etc/zshrc
-        ;;
-    esac
-    if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
-        echo -e "$1" >> ${_bashrc}
-    fi
-    if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
-        echo -e "$1" >> ${_zshrc}
-    fi
-}
-
-function install_xvfb() {
-    if [ "$(ihf_is_debian_or_rhel)" == "debian" ]; then
-        # Xvfb is unavailable in RHEL systems
-        ihf_install_packages "xvfb"
-    fi
-}
-
-_INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=0
-function install_python_and_pip() {
-    if [ "$_INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED" -eq 0 ]; then 
-        if [ "$(ihf_is_debian_or_rhel)" == "rhel" ]; then
-            # uninstalling python3-requests package as it cannot be updated by subsequent install command.
-            ihf_remove_packages "python3-requests"
-        fi
-        ihf_install_packages "python3 python3-pip"
-        _INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=1
-    else
-        echo "Python and PIP have been installed."
-    fi
-}
-
-_MATLAB_PROXY_HAS_BEEN_INSTALLED=0
-function install_matlab_proxy() {
-    if [ "$_MATLAB_PROXY_HAS_BEEN_INSTALLED" -eq 0 ]; then 
-        install_python_and_pip
-        install_xvfb
-
-        $_PIP_INSTALL matlab-proxy
-
-        _MATLAB_PROXY_HAS_BEEN_INSTALLED=1
-    else
-        echo "MATLAB Proxy has been installed."
-    fi
-}
-
-function install_jupyter_matlab_proxy() {
-    install_python_and_pip
-    $_PIP_INSTALL jupyter-matlab-proxy
-}
-
-function install_jupyterlab() {
-    install_python_and_pip
-    $_PIP_INSTALL jupyterlab jupyter
-}
-
-function install_matlab_engine_for_python() {
-    install_python_and_pip
-
-    # TODO: Skip installation if MATLAB Engine for Python does not support of Python version
-    # See: https://mathworks.com/support/requirements/python-compatibility.html
-    declare -A matlabengine_map
-    matlabengine_map['R2025b']="25.2"
-    matlabengine_map['R2025a']="25.1"
-    matlabengine_map['R2024b']="24.2"
-    matlabengine_map['R2024a']="24.1"
-    matlabengine_map['R2023b']="23.2"
-    matlabengine_map['R2023a']="9.14"
-    matlabengine_map['R2022b']="9.13"
-    matlabengine_map['R2022a']="9.12"
-    matlabengine_map['R2021b']="9.11"
-    matlabengine_map['R2021a']="9.10"
-    matlabengine_map['R2020b']="9.9"
-    
-    
-    env LD_LIBRARY_PATH=${_LD_LIBRARY_PATH} \
-    $_PIP_INSTALL matlabengine==${matlabengine_map[$MATLAB_RELEASE]}.*
-    echo "Setting LD_LIBRARY_PATH=${_LD_LIBRARY_PATH}"
-}
-
-# Create a home folder for non-root, undefined CONTAINER_USER, if not already available
-function create_home_folder_for_container_user() {
-    if [ ! -z "$_CONTAINER_USER" -a "$_CONTAINER_USER" != "undefined" ] && [ "$_CONTAINER_USER" != "root" ]; then
-        if [ "$_CONTAINER_USER_HOME" == "undefined" ] || [ -z "$_CONTAINER_USER_HOME"  ]; then
-            echo "Creating home directory for CONTAINER_USER"
-            
-            ORIG_UID=$(id -u $_CONTAINER_USER)
-            ORIG_GID=$(id -g $_CONTAINER_USER)
-            
-            # adduser is the preferred high level function to create a user.
-            # The "-m" flag is used to indicate the creation of the home folder.
-            # The "-M" flag is used to avoid the creation of the home folder.
-            ## We are recreating the CONTAINER_USER after deleting to avoid the "user already exists" error
-            adduser tempuser -M -u $(($ORIG_UID + 1)) -g $ORIG_GID && \
-            userdel $_CONTAINER_USER && \
-            adduser $_CONTAINER_USER -m -u $ORIG_UID -g $ORIG_GID && \
-            userdel tempuser
-            
-            # Set value to newly created home
-            _CONTAINER_USER_HOME=$(cat /etc/passwd | grep $_CONTAINER_USER | cut -d ':' -f 6)
-            
-            # Manual approach without using "adduser"
-            # mkdir /home/$_CONTAINER_USER && \
-            # cp -rT /etc/skel /home/ $_CONTAINER_USER && \
-            # chown -R ${_CONTAINER_USER}:${_CONTAINER_USER} /home/$_CONTAINER_USER
-            # _CONTAINER_USER_HOME="/home/$_CONTAINER_USER"
-            echo "New home directory: ${_CONTAINER_USER_HOME}"
-        fi
-    fi
-}
-
-# Include the helper functions: ihf_*
-source ${_SCRIPT_LOCATION}/install-helper-functions.sh
-
-### Helper Functions End ###
-### Script Section Begin ###
-
-## Handle all other options first before attempting to install MATLAB.
-
-# Verify if valid MATLAB_RELEASE
-if [ "$(ihf_is_valid_matlab_release)" == "false" ]; then
-    ihf_print_and_exit "Invalid or Unsupported MATLAB_RELEASE: $MATLAB_RELEASE "
-fi
-
-MATLAB_FEATURE_INSTALL_TMPDIR=/tmp/matlab-feature-install
-mkdir -p $MATLAB_FEATURE_INSTALL_TMPDIR && pushd $MATLAB_FEATURE_INSTALL_TMPDIR
-
-# Install matlab-proxy if requested
-if [ "${INSTALLMATLABPROXY}" == "true" ]; then
-    echo "Installing matlab-proxy"
-    install_matlab_proxy
-fi
-
-# Install jupyter-matlab-proxy if requested
-if [ "${INSTALLJUPYTERMATLABPROXY}" == "true" ]; then
-    echo "Installing jupyter-matlab-proxy"
-    install_jupyter_matlab_proxy
-fi
-
-# Install jupyterlab if requested
-if [ "${INSTALLJUPYTERLAB}" == "true" ]; then
-    echo "Installing jupyterlab"
-    install_jupyterlab
-fi
-
-if [ "${STARTINDESKTOP}" == "true" ] || [ "${STARTINDESKTOP}" == "test" ]; then
-    echo "User wants to start in MATLAB Desktop."
-    # Leave a marker file that can be checked by the postStartCommand
-    # matlab-proxy will be started by the postStartCommand.
-    # Current postStartCommand:
-    # "( ls ~/.startmatlabdesktop >> /dev/null 2>&1 && env MWI_APP_PORT=8888 matlab-proxy-app 2>/dev/null ) || echo 'Will not start matlab-proxy-app...'",
-    # the /tmp directory is not available on codespaces, using _CONTAINER_USER_HOME instead.
-    
-    create_home_folder_for_container_user
-    
-    if [ ! -z "${_CONTAINER_USER_HOME}" -a "${_CONTAINER_USER_HOME}" != "undefined" ]; then
-        # This feature is only available when _CONTAINER_USER_HOME is known.
-        if [ "${STARTINDESKTOP}" == "true" ]; then
-            install_matlab_proxy &&
-            touch ${_CONTAINER_USER_HOME}/.startmatlabdesktop &&
-            chmod a+rw ${_CONTAINER_USER_HOME}/.startmatlabdesktop &&
-            rm -f ${_CONTAINER_USER_HOME}/.teststartmatlabdesktop
-        else
-            # This file is used during testing and does not actually effect the postStartCommand that is looking for
-            # the startmatlabdesktop file!
-            # Without this, Tests would hang indefinitely waiting for the postStartCommand
-            install_matlab_proxy &&
-            touch ${_CONTAINER_USER_HOME}/.teststartmatlabdesktop &&
-            chmod a+rw ${_CONTAINER_USER_HOME}/.teststartmatlabdesktop &&
-            rm -f ${_CONTAINER_USER_HOME}/.startmatlabdesktop
-        fi
-    else
-        echo "Cannot start in desktop as the _CONTAINER_USER_HOME is undefined or empty. Value:'${_CONTAINER_USER_HOME}'"
-    fi
-fi
-
-# Update RC files with the provided license manager info
-if [ ! -z "${NETWORKLICENSEMANAGER}" -a "${NETWORKLICENSEMANAGER}" != " " ]; then
-    echo "Saving NLM info to bashrc and zshrc"
-    updaterc "export MLM_LICENSE_FILE=${NETWORKLICENSEMANAGER}"
-fi
-
-if [ "$SKIPMATLABINSTALL" != 'true' ]; then
-    
-    ### MATLAB Installation Steps:
-    ## 1. Install OS Dependencies required by MATLAB
-    ## 2. Setup MPM flags based on options
-    ## 3. Install MATLAB using MPM
-    
-    ## 1. Install OS Dependencies required by MATLAB
-    source ${_SCRIPT_LOCATION}/install-matlab-deps.sh ${_SCRIPT_LOCATION}
-    
-    ## 2. Setup MPM flags based on options
-    ADDITIONAL_MPM_FLAGS=" "
-    
-    # Handle DOC installation
-    if [ "${DOC}" == "true" ]; then
-        ADDITIONAL_MPM_FLAGS="${ADDITIONAL_MPM_FLAGS} --doc "
-    fi
-    
-    # Handle GPU installation
-    if [ "${INSTALLGPU}" == "false" ]; then
-        RELEASES_THAT_SUPPORT_NOGPU=("R2025a" "R2024b" "R2024a" "R2023b" "R2023a")
-        # The value variable is assigned a regex that matches the exact value
-        value="\<${MATLAB_RELEASE}\>"
-        if [[ ${RELEASES_THAT_SUPPORT_NOGPU[@]} =~ $value ]]; then
-            echo "'$MATLAB_RELEASE' supports NOGPU flag..."
-            ADDITIONAL_MPM_FLAGS="${ADDITIONAL_MPM_FLAGS} --no-gpu "
-        else
-            echo "'$MATLAB_RELEASE' does not support NOGPU flag, skipping..."
-        fi
-    fi
-    
-    echo "Container user is defined as : '$_CONTAINER_USER'"
-    echo "Container user's effective home dir: '$_CONTAINER_USER_HOME'"
-    echo "Remote user is defined as : '${_REMOTE_USER:-"undefined"}'"
-    echo "Remote user's effective home dir: '${_REMOTE_USER_HOME:-"undefined"}'"
-    
-    ## 3. Install MATLAB using MPM
-    if [ ! -z "$_CONTAINER_USER" -a "$_CONTAINER_USER" != "undefined" ] && [ "$_CONTAINER_USER" != "root" ]; then
-        # Use the containerUser option to set this value. The "vscode" user works well with tests.
-        # The "codespaces" user returns an empty _CONTAINER_USER_HOME
-        echo "Container user is defined as : '$_CONTAINER_USER'"
-        echo "Container user's effective home dir: '$_CONTAINER_USER_HOME'"
-        
-        create_home_folder_for_container_user
-        
-        echo "Proceeding to install matlab as '$_CONTAINER_USER'..."
-
-        echo "Install location for MATLAB: ${MATLAB_INSTALL_LOCATION}"
-        
-        # Switching to container user
-        su $_CONTAINER_USER
-        pushd $_CONTAINER_USER_HOME
-        
-        # Installing MATLAB as containerUser allows for support packages to be installed at the correct location.
-        wget -q https://www.mathworks.com/mpm/glnxa64/mpm &&
-        chmod +x mpm &&
-        sudo HOME=${_CONTAINER_USER_HOME} ./mpm install \
-        --release=${MATLAB_RELEASE} \
-        --destination=${MATLAB_INSTALL_LOCATION} \
-        --products ${MATLAB_PRODUCT_LIST} ${ADDITIONAL_MPM_FLAGS} &&
-        sudo rm -f mpm /tmp/mathworks_root.log &&
-        sudo ln -fs ${MATLAB_INSTALL_LOCATION}/bin/matlab /usr/local/bin/matlab
-        
-        ## Resetting to original context
-        # exit will reset the user to root and call popd
-        # exit
-        popd
-        sudo su
-    else
-        echo "Proceeding to install matlab as root user..."
-        # Installs as root, because feature scripts run as root user.
-        # Any support package installed here will not be accessible to non-root users of the system.
-        wget https://www.mathworks.com/mpm/glnxa64/mpm &&
-        chmod +x mpm &&
-        ./mpm install \
-        --release=${MATLAB_RELEASE} \
-        --destination=${MATLAB_INSTALL_LOCATION} \
-        --products ${MATLAB_PRODUCT_LIST} ${ADDITIONAL_MPM_FLAGS} &&
-        rm -f mpm /tmp/mathworks_root.log &&
-        ln -fs ${MATLAB_INSTALL_LOCATION}/bin/matlab /usr/local/bin/matlab
-    fi
-fi
-
-# MATLAB Engine for Python can only be installed if MATLAB is on the PATH
-if [ "${INSTALLMATLABENGINEFORPYTHON}" == "true" ]; then
-    echo "Installing matlabengine"
-    install_matlab_engine_for_python
-fi
-
-popd
-### Script Section End ###
-echo "MATLAB feature installation is complete."
-unset PIP_BREAK_SYSTEM_PACKAGES
-exit 0
diff --git a/.devcontainer/matlab/tests.sh b/.devcontainer/matlab/tests.sh
deleted file mode 100755
index 47a3b1c..0000000
--- a/.devcontainer/matlab/tests.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Calls conatins to test the install scripts
-
-# Check default installation for R2024b
-RELEASE=R2024b
-RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
-# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted ubuntu:20.04 -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
-
-RELEASE=R2022b
-RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
-# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-docker run -it --rm --entrypoint /usr/bin/sh -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest -c "$RUN_INSTALL_SCRIPT && echo PASSED! || echo FAILED!"
-
-RELEASE=R2024b
-RUN_INSTALL_SCRIPT="env RELEASE=${RELEASE} /mounted/src/matlab/install.sh "
-# TEST="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-docker run -it --rm --entrypoint /usr/bin/bash -v `pwd`:/mounted registry.access.redhat.com/ubi9/ubi:latest
-
-# RELEASE=R2024a
-# RUN_INSTALL_SCRIPT="sudo env INSTALLMATLABENGINEFORPYTHON=true SKIPMATLABINSTALL=true _CONTAINER_USER=matlab \
-# _CONTAINER_USER_HOME=/home/matlab DESTINATION=/opt/matlab/${RELEASE^} RELEASE=${RELEASE} \
-# ~/install/install.sh "
-# TEST_IF_MATLABENGINE_INSTALLED="python3 -m pip list | grep matlabengine && echo PASSED! || echo FAILED!"
-# docker run -it --rm --entrypoint /bin/sh -v `pwd`/src/matlab/:/home/matlab/install mathworks/matlab:${RELEASE} -c "$RUN_INSTALL_SCRIPT && $TEST_IF_MATLABENGINE_INSTALLED"
\ No newline at end of file

From abe81d829b8d50bb15d2313fc4085d952f01a420 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 19 Sep 2025 16:16:21 +0530
Subject: [PATCH 16/19] remove todo.md

---
 src/matlab/TODO.md | 83 ----------------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 src/matlab/TODO.md

diff --git a/src/matlab/TODO.md b/src/matlab/TODO.md
deleted file mode 100644
index d318a1e..0000000
--- a/src/matlab/TODO.md
+++ /dev/null
@@ -1,83 +0,0 @@
-
-# How to install matlab-proxy, jupyter-matlab-proxy or the MATLAB Engine for python 3.12?
-
-- The base install.sh script will install PIPX.
-- The onCreateCommand lifecycle hook, can then call another script to install python packages using PIPX into a single environment.
-- The script will need to be placed into a location that the user can access later on!
-    - Assumptions:
-        * The script has access to the configuration in the JSON file, so that it knows which packages to install.
-        * The script is being run as the end user of the container, only then will the installations by PIPX be visible and on PATH for that user.
-        
-## How to do it?
-
-- Create a base environment, lets say matlab-proxy
-```bash
-pipx install matlab-proxy
-```
-- Then based on other feature requirements, install the others while including their installed apps
-```bash
-pipx inject --include-apps --include-deps matlab-proxy jupyterlab jupyter-matlab-proxy
-```
-
-using pipx would:
-1. Make sure that matlab-proxy-app, is on the path.
-2. However, generic python packages like matlabengine & jupyter-matlab-proxy will not be available to users
-
-What is the user expectation?
-* When the codespace/devcontainer uses the feature:
-    a. The environment is already configured with all the things he needs.
-
-* E1: He expects to have the python interpreter setup
-* E2: He expects to have matlabengine available for use with the python interpreter that is setup
-* E3: If Jupyterlab is available, then he expects to see the MATLAB Integration for Jupyter to show up
-* E4: He expects to have the matlab-proxy-app executable available to call
-
-Strategy 1: PIPX to install MP, JMP + Jupyter, ME into a single PIPX MATLAB VENV
-
-Expectations met: E4, E3, E2(only if he uses the notebook)
-Expectations failed: E1 & E2
-
-Strategy 2: Strategy 1 + Activate the PIPX MATLAB VENV
-
-NOTES:
-* PIPX is a tool to install command line utilities, and not meant for environment management.
-* Renaming of environments created using PIPX is directly supported. 
-    - one could rename the 
-
-
-# Attempt 1:
-Using the --global flag or equivalent option in PIPX along with ensureonpath as root user.
-This allows for the executables to be available for the logged in user.
-
-PIPX is anyways not meant to be a solution for extensibility of packages.
-
-## Behavior
-1. executables are found on path by end user.
-2. there may be shadowing of executables. ex: mathworks/matlab installs MPA, and that executable sits higher up on the path than the one installed by the devcontainer feature.
-3. 
-
-## To Check:
-See if the notebook can be used from vscode.
-
-## Issues found:
-1. mathworks/matlab:r2025a had issues with user privileges. The mounted repostiory files could not be used.
-    * There may be a way to get past this in the devcontainer configuration files.
-
-2. 
-
-## Discoveries
-1. MATLAB Engine for Python was able to render the login screens when using `-licmode onlinelicensing`
-   The environment was: A Devcontainer running WSL2 on Windows  
-# Thoughts
-
-## what are the goals of the devcontainer feature.
-* Make it easy to install MATLAB into devcontainers
-* Make it easier to use MATLAB in the containerized environment
-
-* What are the ways in which people use MATLAB:
- 1. command line
- 2. VSCode editor run and edit
- 3. Jupyter notebooks in vscode.
- 4. Jupyter executable
- 5. Desktop MATLAB 
- 6. 

From c3903285ed811000957b647e13b51e20dcd92894 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Fri, 19 Sep 2025 16:21:22 +0530
Subject: [PATCH 17/19] remove readme cruft

---
 src/matlab/README.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/matlab/README.md b/src/matlab/README.md
index 66a8b04..695b4ac 100644
--- a/src/matlab/README.md
+++ b/src/matlab/README.md
@@ -38,14 +38,3 @@ Installs MATLAB with supporting packages and tools.
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/mathworks/devcontainer-features/blob/main/src/matlab/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
-
-
-## Things to Test:
-
-1. Works with the following images & python versions:
-
- - Ubuntu 22.04 / Python 3.10
- - Ubuntu 24.04 / Python 3.12
-
-2. What is the strategy for mathworks/matlab images which already have matlab-proxy installed?
-   The usecase could be that someone wants to install JMP and use with Jupyter ? 
\ No newline at end of file

From 5a39b7d61845017f4930dda1e9f594d6c5b55091 Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <prabhakk@mathworks.com>
Date: Mon, 22 Sep 2025 12:46:13 +0530
Subject: [PATCH 18/19] responding to feedback, ihf_is_debian_13 returns int
 instead of string

---
 src/matlab/install-helper-functions.sh | 8 +++++---
 src/matlab/install-matlab-deps.sh      | 4 ++--
 src/matlab/install.sh                  | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/matlab/install-helper-functions.sh b/src/matlab/install-helper-functions.sh
index 0e8b07a..e98b6d2 100755
--- a/src/matlab/install-helper-functions.sh
+++ b/src/matlab/install-helper-functions.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 #-------------------------------------------------------------------------------------------------------------
 # Helpers functions to encapsulate OS specific installation
 
@@ -167,9 +167,11 @@ function ihf_is_debian_or_rhel() {
 function ihf_is_debian_13 {
     . /etc/os-release
     if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" = "13" ]; then
-        echo "true"
+        # True
+        return 0
     else
-        echo "false"
+        # False
+        return 1
     fi
 }
 
diff --git a/src/matlab/install-matlab-deps.sh b/src/matlab/install-matlab-deps.sh
index bc2e57d..b113195 100755
--- a/src/matlab/install-matlab-deps.sh
+++ b/src/matlab/install-matlab-deps.sh
@@ -2,7 +2,7 @@
 # This script install the OS dependencies required by MATLAB for the release specified in the
 # environment variable MATLAB_RELEASE on any linux OS that is dervied from Ubuntu or RHEL
 #-------------------------------------------------------------------------------------------------------------
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 #-------------------------------------------------------------------------------------------------------------
 
 set -eu -o pipefail
@@ -44,7 +44,7 @@ function get_base_dependencies_list() {
     # Get matlab_deps - if this fails, then we aren't on a supported os
     local PKGS=$(wget -qO- ${BASE_DEPS_URL})
     # if Debian 13, then remove packages which have dpdk in their name
-    if [ "$(ihf_is_debian_13)" == "true" ]; then
+    if ihf_is_debian_13; then
         PKGS=$(echo $PKGS | tr ' ' '\n' | grep -v 'dpdk' | tr '\n' ' ')
     fi
     if [ -z "$PKGS" ]; then
diff --git a/src/matlab/install.sh b/src/matlab/install.sh
index c192c77..8788d9d 100755
--- a/src/matlab/install.sh
+++ b/src/matlab/install.sh
@@ -92,7 +92,7 @@ function install_python_and_pip() {
         ihf_install_packages "python3 python3-pip"
         _INSTALL_PYTHON_AND_PIP_HAS_BEEN_INSTALLED=1
     else
-        echo "Python and PIP have been installed."
+        echo "Python and PIP already installed."
     fi
 }
 
@@ -106,7 +106,7 @@ function install_matlab_proxy() {
 
         _MATLAB_PROXY_HAS_BEEN_INSTALLED=1
     else
-        echo "MATLAB Proxy has been installed."
+        echo "MATLAB Proxy already installed."
     fi
 }
 

From 92d9630b143255adb0ef56c8fcb74940facd58c0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Sep 2025 09:10:06 +0000
Subject: [PATCH 19/19] Automated documentation update [skip ci]

---
 src/matlab/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/matlab/README.md b/src/matlab/README.md
index 695b4ac..45cedb7 100644
--- a/src/matlab/README.md
+++ b/src/matlab/README.md
@@ -7,7 +7,7 @@ Installs MATLAB with supporting packages and tools.
 
 ```json
 "features": {
-    "ghcr.io/mathworks/devcontainer-features/matlab:0": {}
+    "ghcr.io/prabhakk-mw/devcontainer-features/matlab:0": {}
 }
 ```
 
@@ -15,13 +15,14 @@ Installs MATLAB with supporting packages and tools.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| release | MATLAB Release to install. | string | R2024b |
+| release | MATLAB Release to install. | string | R2025b |
 | products | Products to install, specified as a list of space-separated product names.</br> For details of products, see [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md#product-installation-options). | string | MATLAB |
 | doc | Flag to install documentation and examples (R2022b and earlier releases). | boolean | false |
 | installGpu | Skips installation of GPU libraries when you install Parallel Computing Toolbox (R2023a and later releases). | boolean | false |
 | destination | Full path to the installation destination folder. Default: /opt/matlab/${RELEASE^} | string | - |
 | installMatlabProxy | Installs matlab-proxy and its dependencies (R2020b and later releases). | boolean | false |
 | installJupyterMatlabProxy | Installs jupyter-matlab-proxy and its dependencies (R2020b and later releases). | boolean | false |
+| installJupyterLab | Installs jupyterlab | boolean | false |
 | installMatlabEngineForPython | Installs the MATLAB Engine for Python if the destination option is set correctly. | boolean | false |
 | startInDesktop | Starts matlab-proxy when container starts. | string | false |
 | networkLicenseManager | MATLAB will use the specified Network License Manager. | string | - |
@@ -37,4 +38,4 @@ Installs MATLAB with supporting packages and tools.
 
 ---
 
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/mathworks/devcontainer-features/blob/main/src/matlab/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/prabhakk-mw/devcontainer-features/blob/main/src/matlab/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._