diff --git a/build_artifacts/v2/v2.1/v2.1.1/Dockerfile b/build_artifacts/v2/v2.1/v2.1.1/Dockerfile
new file mode 100644
index 00000000..e628c2e2
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/Dockerfile
@@ -0,0 +1,186 @@
+ARG TAG_FOR_BASE_MICROMAMBA_IMAGE
+FROM mambaorg/micromamba:$TAG_FOR_BASE_MICROMAMBA_IMAGE
+
+ARG CUDA_MAJOR_MINOR_VERSION=''
+ARG ENV_IN_FILENAME
+ARG ARG_BASED_ENV_IN_FILENAME
+ARG IMAGE_VERSION
+LABEL "org.amazon.sagemaker-distribution.image.version"=$IMAGE_VERSION
+
+ARG AMZN_BASE="/opt/amazon/sagemaker"
+ARG DB_ROOT_DIR="/opt/db"
+ARG DIRECTORY_TREE_STAGE_DIR="${AMZN_BASE}/dir-staging"
+
+ARG NB_USER="sagemaker-user"
+ARG NB_UID=1000
+ARG NB_GID=100
+
+# https://www.openssl.org/source/
+ARG FIPS_VALIDATED_SSL=3.0.8
+
+ENV SAGEMAKER_LOGGING_DIR="/var/log/sagemaker/"
+ENV STUDIO_LOGGING_DIR="/var/log/studio/"
+ENV EDITOR="nano"
+ENV IMAGE_VERSION=$IMAGE_VERSION
+
+USER root
+RUN usermod "--login=${NB_USER}" "--home=/home/${NB_USER}" --move-home "-u ${NB_UID}" "${MAMBA_USER}" && \
+    groupmod "--new-name=${NB_USER}" --non-unique "-g ${NB_GID}" "${MAMBA_USER}" && \
+    # Update the expected value of MAMBA_USER for the
+    # _entrypoint.sh consistency check.
+    echo "${NB_USER}" > "/etc/arg_mamba_user" && \
+    :
+ENV MAMBA_USER=$NB_USER
+ENV USER=$NB_USER
+
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends sudo gettext-base wget curl unzip git rsync build-essential openssh-client nano cron less mandoc && \
+    # We just install tzdata below but leave default time zone as UTC. This helps packages like Pandas to function correctly.
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata krb5-user libkrb5-dev libsasl2-dev libsasl2-modules && \
+    chmod g+w /etc/passwd && \
+    echo "ALL    ALL=(ALL)    NOPASSWD:    ALL" >> /etc/sudoers && \
+    touch /etc/krb5.conf.lock && chown ${NB_USER}:${MAMBA_USER} /etc/krb5.conf* && \
+    # Note that we do NOT run `rm -rf /var/lib/apt/lists/*` here. If we did, anyone building on top of our images will
+    # not be able to run any `apt-get install` commands and that would hamper customizability of the images.
+    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    sudo ./aws/install && \
+    rm -rf aws awscliv2.zip && \
+    : && \
+    echo "source /usr/local/bin/_activate_current_env.sh" | tee --append /etc/profile && \
+# CodeEditor - create server, user data dirs
+    mkdir -p /opt/amazon/sagemaker/sagemaker-code-editor-server-data /opt/amazon/sagemaker/sagemaker-code-editor-user-data \
+    && chown $MAMBA_USER:$MAMBA_USER /opt/amazon/sagemaker/sagemaker-code-editor-server-data /opt/amazon/sagemaker/sagemaker-code-editor-user-data && \
+# create dir to store user data files
+    mkdir -p /opt/amazon/sagemaker/user-data \
+    && chown $MAMBA_USER:$MAMBA_USER /opt/amazon/sagemaker/user-data && \
+# Merge in OS directory tree contents.
+    mkdir -p ${DIRECTORY_TREE_STAGE_DIR}
+COPY dirs/ ${DIRECTORY_TREE_STAGE_DIR}/
+RUN rsync -a ${DIRECTORY_TREE_STAGE_DIR}/ / && \
+    rm -rf ${DIRECTORY_TREE_STAGE_DIR} && \
+# CodeEditor - download the extensions
+    mkdir -p /etc/code-editor/extensions && \
+    while IFS= read -r url || [ -n "$url" ]; do \
+        echo "Downloading extension from ${url}..." && \
+        wget --no-check-certificate -P /etc/code-editor/extensions "${url}"; \
+    done < /etc/code-editor/extensions.txt
+
+USER $MAMBA_USER
+COPY --chown=$MAMBA_USER:$MAMBA_USER $ENV_IN_FILENAME *.in /tmp/
+ARG MAMBA_DOCKERFILE_ACTIVATE=1
+ARG CONDA_OVERRIDE_CUDA=$CUDA_MAJOR_MINOR_VERSION
+
+# Make sure that $ENV_IN_FILENAME has a newline at the end before the `tee` command runs. Otherwise, nasty things
+# will happen.
+RUN if [[ -z $ARG_BASED_ENV_IN_FILENAME ]] ; \
+    then echo 'No ARG_BASED_ENV_IN_FILENAME passed' ; \
+    else envsubst < /tmp/$ARG_BASED_ENV_IN_FILENAME | tee --append /tmp/$ENV_IN_FILENAME ; \
+    fi && \
+    # Enforce dependencies are all installed from conda-forge
+    micromamba install -y --name base --file /tmp/$ENV_IN_FILENAME && \
+    micromamba clean --all --yes --force-pkgs-dirs && \
+    rm -rf /tmp/*.in && \
+    sudo ln -s $(which python3) /usr/bin/python && \
+    # Update npm version
+    npm i -g npm && \
+    # Enforce to use `conda-forge` as only channel, by removing `defaults`
+    conda config --remove channels defaults && \
+    micromamba config append channels conda-forge --env && \
+    # Configure CodeEditor - Install extensions and set preferences
+    extensionloc=/opt/amazon/sagemaker/sagemaker-code-editor-server-data/extensions && mkdir -p "${extensionloc}" \
+    # Loop through all vsix files in /etc/code-editor/extensions and install them
+    && for ext in /etc/code-editor/extensions/*.vsix; do \
+        echo "Installing extension ${ext}..."; \
+        sagemaker-code-editor --install-extension "${ext}" --extensions-dir "${extensionloc}" --server-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data --user-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-user-data; \
+       done \
+    # Copy the settings
+    && cp /etc/code-editor/code_editor_machine_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/Machine/settings.json && \
+    # Install glue kernels, and move to shared directory
+    # Also patching base kernel so Studio background code doesn't start session silently
+    install-glue-kernels && \
+    SITE_PACKAGES=$(pip show aws-glue-sessions | grep Location | awk '{print $2}') && \
+    jupyter-kernelspec install $SITE_PACKAGES/aws_glue_interactive_sessions_kernel/glue_pyspark --user && \
+    jupyter-kernelspec install $SITE_PACKAGES/aws_glue_interactive_sessions_kernel/glue_spark --user && \
+    mv /home/sagemaker-user/.local/share/jupyter/kernels/glue_pyspark /opt/conda/share/jupyter/kernels && \
+    mv /home/sagemaker-user/.local/share/jupyter/kernels/glue_spark /opt/conda/share/jupyter/kernels && \
+    sed -i '/if not store_history and (/i\        if "sm_analytics_runtime_check" in code:\n            return await self._complete_cell()\n' \
+    "$SITE_PACKAGES/aws_glue_interactive_sessions_kernel/glue_kernel_base/BaseKernel.py" && \
+    # Install FIPS Provider for OpenSSL, on top of existing OpenSSL installation
+    # v3.0.8 is latest FIPS validated provider, so this is the one we install
+    # But we need to run tests against the installed version.
+    # see https://github.com/openssl/openssl/blob/master/README-FIPS.md https://www.openssl.org/source/
+    INSTALLED_SSL=$(micromamba list | grep openssl | tr -s ' ' | cut -d ' ' -f 3 | head -n 1) && \
+    # download source code for installed, and FIPS validated openssl versions
+    curl -L https://github.com/openssl/openssl/releases/download/openssl-$FIPS_VALIDATED_SSL/openssl-$FIPS_VALIDATED_SSL.tar.gz > openssl-$FIPS_VALIDATED_SSL.tar.gz &&  \
+    curl -L https://github.com/openssl/openssl/releases/download/openssl-$INSTALLED_SSL/openssl-$INSTALLED_SSL.tar.gz > openssl-$INSTALLED_SSL.tar.gz &&  \
+    tar -xf openssl-$FIPS_VALIDATED_SSL.tar.gz && tar -xf openssl-$INSTALLED_SSL.tar.gz && cd openssl-$FIPS_VALIDATED_SSL && \
+    # Configure both versions to enable FIPS and build
+    ./Configure enable-fips --prefix=/opt/conda --openssldir=/opt/conda/ssl && make && \
+    cd ../openssl-$INSTALLED_SSL && \
+    ./Configure enable-fips --prefix=/opt/conda --openssldir=/opt/conda/ssl && make && \
+    # Copy validated provider to installed version for testing
+    cp ../openssl-$FIPS_VALIDATED_SSL/providers/fips.so providers/. && \
+    cp ../openssl-$FIPS_VALIDATED_SSL/providers/fipsmodule.cnf providers/. && \
+    make tests && cd ../openssl-$FIPS_VALIDATED_SSL && \
+    # After tests pass, install FIPS provider and remove source code
+    make install_fips && cd .. && rm -rf ./openssl-* && \
+# Create new config file with fips-enabled. Then user can override OPENSSL_CONF to enable FIPS
+# e.g. export OPENSSL_CONF=/opt/conda/ssl/openssl-fips.cnf
+    cp /opt/conda/ssl/openssl.cnf /opt/conda/ssl/openssl-fips.cnf && \
+    sed -i "s:# .include fipsmodule.cnf:.include /opt/conda/ssl/fipsmodule.cnf:" /opt/conda/ssl/openssl-fips.cnf && \
+    sed -i 's:# fips = fips_sect:fips = fips_sect:' /opt/conda/ssl/openssl-fips.cnf && \
+# Install Kerberos.
+# Make sure no dependency is added/updated
+    pip install "krb5>=0.5.1,<0.6" && \
+    pip show krb5 | grep Require | xargs -i sh -c '[ $(echo {} | cut -d: -f2 | wc -w) -eq 0 ] ' && \
+# https://stackoverflow.com/questions/122327
+    SYSTEM_PYTHON_PATH=$(python3 -c "from __future__ import print_function;import sysconfig; print(sysconfig.get_paths().get('purelib'))") && \
+    # Remove SparkRKernel as it's not supported \
+    jupyter-kernelspec remove -f -y sparkrkernel && \
+    # Patch Sparkmagic lib to support Custom Certificates \
+    # https://github.com/jupyter-incubator/sparkmagic/pull/435/files \
+    cp -a ${SYSTEM_PYTHON_PATH}/sagemaker_studio_analytics_extension/patches/configuration.py ${SYSTEM_PYTHON_PATH}/sparkmagic/utils/ && \
+    cp -a ${SYSTEM_PYTHON_PATH}/sagemaker_studio_analytics_extension/patches/reliablehttpclient.py ${SYSTEM_PYTHON_PATH}/sparkmagic/livyclientlib/reliablehttpclient.py && \
+    sed -i 's=  "python"=  "/opt/conda/bin/python"=g'  /opt/conda/share/jupyter/kernels/pysparkkernel/kernel.json /opt/conda/share/jupyter/kernels/sparkkernel/kernel.json && \
+    sed -i 's="Spark"="SparkMagic Spark"=g'  /opt/conda/share/jupyter/kernels/sparkkernel/kernel.json && \
+    sed -i 's="PySpark"="SparkMagic PySpark"=g'  /opt/conda/share/jupyter/kernels/pysparkkernel/kernel.json && \
+    # Configure RTC - disable jupyter_collaboration by default
+    jupyter labextension disable @jupyter/collaboration-extension
+
+# Patch glue kernels to use kernel wrapper
+COPY patch_glue_pyspark.json /opt/conda/share/jupyter/kernels/glue_pyspark/kernel.json
+COPY patch_glue_spark.json /opt/conda/share/jupyter/kernels/glue_spark/kernel.json
+
+USER root
+
+# Create logging directories for supervisor
+RUN mkdir -p $SAGEMAKER_LOGGING_DIR && \
+    chmod a+rw $SAGEMAKER_LOGGING_DIR && \
+    mkdir -p ${STUDIO_LOGGING_DIR} && \
+    chown ${NB_USER}:${MAMBA_USER} ${STUDIO_LOGGING_DIR} && \
+
+    # Clean up CodeEditor artifacts
+    rm -rf /etc/code-editor && \
+    # Create supervisord runtime directory
+    mkdir -p /var/run/supervisord && \
+    chmod a+rw /var/run/supervisord && \
+    # Create root directory for DB
+    # Create logging directories for supervisor
+    mkdir -p $DB_ROOT_DIR && \
+    chmod a+rw $DB_ROOT_DIR && \
+    HOME_DIR="/home/${NB_USER}/licenses" \
+    && mkdir -p ${HOME_DIR} \
+    && curl -o ${HOME_DIR}/oss_compliance.zip https://aws-dlinfra-utilities.s3.amazonaws.com/oss_compliance.zip \
+    && unzip ${HOME_DIR}/oss_compliance.zip -d ${HOME_DIR}/ \
+    && cp ${HOME_DIR}/oss_compliance/test/testOSSCompliance /usr/local/bin/testOSSCompliance \
+    && chmod +x /usr/local/bin/testOSSCompliance \
+    && chmod +x ${HOME_DIR}/oss_compliance/generate_oss_compliance.sh \
+    && ${HOME_DIR}/oss_compliance/generate_oss_compliance.sh ${HOME_DIR} python \
+    && rm -rf ${HOME_DIR}/oss_compliance*
+
+ENV PATH="/opt/conda/bin:/opt/conda/condabin:$PATH"
+WORKDIR "/home/${NB_USER}"
+ENV SHELL=/bin/bash
+ENV OPENSSL_MODULES=/opt/conda/lib64/ossl-modules/
+USER $MAMBA_USER
diff --git a/build_artifacts/v2/v2.1/v2.1.1/cpu.env.in b/build_artifacts/v2/v2.1/v2.1.1/cpu.env.in
new file mode 100644
index 00000000..86ea1ebc
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/cpu.env.in
@@ -0,0 +1,57 @@
+# This file is auto-generated.
+conda-forge::jupyter-activity-monitor-extension[version='>=0.3.1,<0.4.0']
+conda-forge::mlflow[version='>=2.17.0,<2.18.0']
+conda-forge::sagemaker-mlflow[version='>=0.1.0,<0.2.0']
+conda-forge::langchain-aws[version='>=0.1.18,<0.2.0']
+conda-forge::jupyter-collaboration[version='>=2.1.4,<2.2.0']
+conda-forge::sagemaker-code-editor[version='>=1.3.3,<1.4.0']
+conda-forge::amazon_sagemaker_sql_editor[version='>=0.1.12,<0.2.0']
+conda-forge::amazon-sagemaker-sql-magic[version='>=0.1.3,<0.2.0']
+conda-forge::amazon-sagemaker-jupyter-ai-q-developer[version='>=1.0.12,<1.1.0']
+conda-forge::amazon-q-developer-jupyterlab-ext[version='>=3.4.0,<3.5.0']
+conda-forge::langchain[version='>=0.2.16,<0.3.0']
+conda-forge::fastapi[version='>=0.115.2,<0.116.0']
+conda-forge::uvicorn[version='>=0.32.0,<0.33.0']
+conda-forge::pytorch[version='>=2.4.1,<2.5.0']
+conda-forge::tensorflow[version='>=2.17.0,<2.18.0']
+conda-forge::python[version='>=3.11.10,<3.12.0']
+conda-forge::pip[version='>=24.2,<24.3.0']
+conda-forge::torchvision[version='>=0.19.1,<0.20.0']
+conda-forge::numpy[version='>=1.26.4,<1.27.0']
+conda-forge::pandas[version='>=2.2.3,<2.3.0']
+conda-forge::scikit-learn[version='>=1.5.2,<1.6.0']
+conda-forge::jinja2[version='>=3.1.4,<3.2.0']
+conda-forge::matplotlib-base[version='>=3.9.2,<3.10.0']
+conda-forge::sagemaker-headless-execution-driver[version='>=0.0.13,<0.1.0']
+conda-forge::ipython[version='>=8.28.0,<8.29.0']
+conda-forge::scipy[version='>=1.14.1,<1.15.0']
+conda-forge::keras[version='>=3.6.0,<3.7.0']
+conda-forge::py-xgboost-cpu[version='>=2.1.1,<2.2.0']
+conda-forge::jupyterlab[version='>=4.1.8,<4.2.0']
+conda-forge::ipywidgets[version='>=8.1.5,<8.2.0']
+conda-forge::conda[version='>=24.9.2,<24.10.0']
+conda-forge::boto3[version='>=1.34.162,<1.35.0']
+conda-forge::sagemaker-python-sdk[version='>=2.227.0,<2.228.0']
+conda-forge::supervisor[version='>=4.2.5,<4.3.0']
+conda-forge::autogluon[version='>=1.1.1,<1.2.0']
+conda-forge::aws-glue-sessions[version='>=1.0.7,<1.1.0']
+conda-forge::sagemaker-kernel-wrapper[version='>=0.0.4,<0.1.0']
+conda-forge::jupyter-ai[version='>=2.25.0,<2.26.0']
+conda-forge::jupyter-scheduler[version='>=2.9.0,<2.10.0']
+conda-forge::jupyter-lsp[version='>=2.2.5,<2.3.0']
+conda-forge::jupyterlab-lsp[version='>=5.0.3,<5.1.0']
+conda-forge::python-lsp-server[version='>=1.12.0,<1.13.0']
+conda-forge::notebook[version='>=7.1.3,<7.2.0']
+conda-forge::altair[version='>=5.4.1,<5.5.0']
+conda-forge::sagemaker-studio-analytics-extension[version='>=0.1.2,<0.2.0']
+conda-forge::jupyter-dash[version='>=0.4.2,<0.5.0']
+conda-forge::sagemaker-jupyterlab-extension[version='>=0.3.2,<0.4.0']
+conda-forge::sagemaker-jupyterlab-emr-extension[version='>=0.3.3,<0.4.0']
+conda-forge::amazon-sagemaker-jupyter-scheduler[version='>=3.1.6,<3.2.0']
+conda-forge::jupyter-server-proxy[version='>=4.4.0,<4.5.0']
+conda-forge::jupyterlab-git[version='>=0.50.1,<0.51.0']
+conda-forge::pyhive[version='>=0.7.0,<0.8.0']
+conda-forge::python-gssapi[version='>=1.9.0,<1.10.0']
+conda-forge::tf-keras[version='>=2.17.0,<2.18.0']
+conda-forge::git-remote-codecommit[version='>=1.16,<1.17.0']
+conda-forge::sentencepiece[version='>=0.1.99,<0.2.0']
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/code-editor/code_editor_machine_settings.json b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/code-editor/code_editor_machine_settings.json
new file mode 100644
index 00000000..44fb8ef7
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/code-editor/code_editor_machine_settings.json
@@ -0,0 +1,4 @@
+{
+    "python.terminal.activateEnvironment": false,
+    "python.defaultInterpreterPath": "/opt/conda/bin/python"
+}
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/code-editor/extensions.txt b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/code-editor/extensions.txt
new file mode 100644
index 00000000..29d683eb
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/code-editor/extensions.txt
@@ -0,0 +1,3 @@
+https://open-vsx.org/api/ms-toolsai/jupyter/2023.9.100/file/ms-toolsai.jupyter-2023.9.100.vsix
+https://open-vsx.org/api/ms-python/python/2023.20.0/file/ms-python.python-2023.20.0.vsix
+https://open-vsx.org/api/amazonwebservices/aws-toolkit-vscode/1.99.0/file/amazonwebservices.aws-toolkit-vscode-1.99.0.vsix
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/conda/.condarc b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/conda/.condarc
new file mode 100644
index 00000000..c3616df5
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/conda/.condarc
@@ -0,0 +1,6 @@
+envs_dirs:
+   - ~/.conda/envs
+   - /opt/conda/envs
+pkgs_dirs:
+  - ~/.conda/pkgs
+  - /opt/conda/pkgs
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/jupyter/jupyter_server_config.py b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/jupyter/jupyter_server_config.py
new file mode 100644
index 00000000..0182cc23
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/jupyter/jupyter_server_config.py
@@ -0,0 +1,28 @@
+# Default Jupyter server config
+# Note: those config can be overridden by user-level configs.
+
+c.ServerApp.terminado_settings = {"shell_command": ["/bin/bash"]}
+c.ServerApp.tornado_settings = {"compress_response": True}
+
+# Do not delete files to trash. Instead, permanently delete files.
+c.FileContentsManager.delete_to_trash = False
+
+# Allow deleting non-empty directory via file browser. Related documentation:
+# https://github.com/jupyter-server/jupyter_server/blob/main/jupyter_server/services/contents/filemanager.py#L125-L129
+c.FileContentsManager.always_delete_dir = True
+
+# Enable `allow_hidden` by default, so hidden files are accessible via Jupyter server
+# Related documentation: https://jupyterlab.readthedocs.io/en/stable/user/files.html#displaying-hidden-files
+c.ContentsManager.allow_hidden = True
+
+# This will set the LanguageServerManager.extra_node_roots setting if amazon_sagemaker_sql_editor exists in the
+# environment. Ignore otherwise, don't fail the JL server start
+# Related documentation: https://jupyterlab-lsp.readthedocs.io/en/v3.4.0/Configuring.html
+try:
+    import os
+
+    module = __import__("amazon_sagemaker_sql_editor")
+    module_location = os.path.dirname(module.__file__)
+    c.LanguageServerManager.extra_node_roots = [f"{module_location}/sql-language-server"]
+except:
+    pass
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-code-editor.conf b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-code-editor.conf
new file mode 100644
index 00000000..cac5669b
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-code-editor.conf
@@ -0,0 +1,11 @@
+[include]
+files = supervisord-common.conf
+
+[program:codeeditorserver]
+directory=%(ENV_HOME)s
+command=start-code-editor
+autostart=true
+autorestart=true
+stdout_logfile=/dev/fd/1   ; Redirect web server logs to stdout
+stdout_logfile_maxbytes = 0 ; Fix: https://github.com/Supervisor/supervisor/issues/935
+stderr_logfile_maxbytes = 0 ; Fix: https://github.com/Supervisor/supervisor/issues/935
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-common.conf b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-common.conf
new file mode 100644
index 00000000..27820d4c
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-common.conf
@@ -0,0 +1,18 @@
+[supervisord]
+nodaemon=true
+
+pidfile=/var/run/supervisord/supervisord.pid
+logfile=%(ENV_STUDIO_LOGGING_DIR)s/%(ENV_SAGEMAKER_APP_TYPE_LOWERCASE)s/supervisord/supervisord.log
+logfile_maxbytes=5MB
+logfile_backups=10
+redirect_stderr=true
+
+[unix_http_server]
+file=/var/run/supervisord/supervisor.sock
+chmod=0700
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisord/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-jupyter-lab.conf b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-jupyter-lab.conf
new file mode 100644
index 00000000..5694ac11
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord-jupyter-lab.conf
@@ -0,0 +1,11 @@
+[include]
+files = supervisord-common.conf
+
+[program:jupyterlabserver]
+directory=%(ENV_HOME)s
+command=start-jupyter-server
+stopasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord.conf b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord.conf
new file mode 100644
index 00000000..686f4a5c
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/etc/supervisor/conf.d/supervisord.conf
@@ -0,0 +1,27 @@
+[supervisord]
+nodaemon=true
+
+pidfile=/var/run/supervisord/supervisord.pid
+logfile=%(ENV_STUDIO_LOGGING_DIR)s/%(ENV_SAGEMAKER_APP_TYPE_LOWERCASE)s/supervisord/supervisord.log
+logfile_maxbytes=5MB
+logfile_backups=10
+redirect_stderr=true
+
+[unix_http_server]
+file=/var/run/supervisord/supervisor.sock
+chmod=0700
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisord/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[program:jupyterlabserver]
+directory=%(ENV_HOME)s
+command=start-jupyter-server
+stopasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/entrypoint-code-editor b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/entrypoint-code-editor
new file mode 100755
index 00000000..bf55a371
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/entrypoint-code-editor
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Generate and execute the shell code to modifies shell variables to include
+# micromamba commands (e.g. using `micromamba activate` to activate environments)
+eval "$(micromamba shell hook --shell=bash)"
+
+# Activate conda environment 'base', where supervisord is installed
+micromamba activate base
+
+# Set up SAGEMAKER_APP_TYPE_LOWERCASE based on SAGEMAKER_APP_TYPE
+export SAGEMAKER_APP_TYPE_LOWERCASE=$(echo $SAGEMAKER_APP_TYPE | tr '[:upper:]' '[:lower:]')
+
+mkdir -p $STUDIO_LOGGING_DIR/$SAGEMAKER_APP_TYPE_LOWERCASE/supervisord
+exec supervisord -c /etc/supervisor/conf.d/supervisord-code-editor.conf -n
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/entrypoint-jupyter-server b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/entrypoint-jupyter-server
new file mode 100755
index 00000000..ceda89d0
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/entrypoint-jupyter-server
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Generate and execute the shell code to modifies shell variables to include
+# micromamba commands (e.g. using `micromamba activate` to activate environments)
+eval "$(micromamba shell hook --shell=bash)"
+
+# Activate conda environment 'base', where supervisord is installed
+micromamba activate base
+
+# Set up SAGEMAKER_APP_TYPE_LOWERCASE based on SAGEMAKER_APP_TYPE
+export SAGEMAKER_APP_TYPE_LOWERCASE=$(echo $SAGEMAKER_APP_TYPE | tr '[:upper:]' '[:lower:]')
+
+# Start supervisord with supervisord configuration
+# Since program 'jupyterlabserver' autostarts by default, it will be started
+# automatically along with supervisord
+mkdir -p $STUDIO_LOGGING_DIR/$SAGEMAKER_APP_TYPE_LOWERCASE/supervisord
+exec supervisord -c /etc/supervisor/conf.d/supervisord.conf -n
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/restart-jupyter-server b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/restart-jupyter-server
new file mode 100755
index 00000000..6f2af98d
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/restart-jupyter-server
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+echo "Restarting the Jupyter server. This page should refresh in a few seconds. Note that any terminals will be closed."
+echo "If this page doesn't refresh after a few seconds, try reloading your browser window."
+echo "Restarting now..."
+nohup supervisorctl -c /etc/supervisor/conf.d/supervisord.conf restart jupyterlabserver > /dev/null 2>&1 &
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/start-code-editor b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/start-code-editor
new file mode 100755
index 00000000..bc97106c
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/start-code-editor
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+eval "$(micromamba shell hook --shell=bash)"
+
+# Activate conda environment 'base', which is the default environment for sagemaker-distribution
+micromamba activate base
+
+# Start code-editor server
+if [ -n "$SAGEMAKER_APP_TYPE_LOWERCASE" ]; then
+  # SAGEMAKER_APP_TYPE is set, indicating the server is running within a SageMaker
+  # app. Configure the base url to be `/<app-type-in-lower-case>/default`.
+  sagemaker-code-editor --host 0.0.0.0 --port 8888 \
+    --without-connection-token \
+    --base-path "/$SAGEMAKER_APP_TYPE_LOWERCASE/default" \
+    --server-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data \
+    --extensions-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data/extensions \
+    --user-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-user-data
+else
+  sagemaker-code-editor --host 0.0.0.0 --port 8888 \
+    --without-connection-token \
+    --server-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data \
+    --extension-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data/extensions \
+    --user-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-user-data
+fi
diff --git a/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/start-jupyter-server b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/start-jupyter-server
new file mode 100755
index 00000000..6ff4eac3
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/dirs/usr/local/bin/start-jupyter-server
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+eval "$(micromamba shell hook --shell=bash)"
+
+# Activate conda environment 'base', which is the default environment for Cosmos
+micromamba activate base
+
+# Start Jupyter server in rtc mode for shared spaces
+if [ -n "$SAGEMAKER_APP_TYPE_LOWERCASE" ] && [ "$SAGEMAKER_SPACE_TYPE_LOWERCASE" == "shared" ]; then
+  jupyter labextension enable @jupyter/collaboration-extension
+  # SAGEMAKER_APP_TYPE is set, indicating the server is running within a SageMaker
+  # app. Configure the base url to be `/<app-type-in-lower-case>/default`.
+  # SAGEMAKER_SPACE_TYPE_LOWERCASE flag is used to determine if the server should start
+  # in real-time-collaboration mode for a given space.
+  jupyter lab --ip 0.0.0.0 --port 8888 \
+    --ServerApp.base_url="/$SAGEMAKER_APP_TYPE_LOWERCASE/default" \
+    --ServerApp.token='' \
+    --ServerApp.allow_origin='*' \
+    --collaborative \
+    --ServerApp.identity_provider_class=sagemaker_jupyterlab_extension_common.identity.SagemakerIdentityProvider \
+    --YDocExtension.ystore_class=sagemaker_jupyterlab_extension_common.ydoc_override.ydoc.MySQLiteYStore
+
+# Start Jupyter server
+elif [ -n "$SAGEMAKER_APP_TYPE_LOWERCASE" ]; then
+  # SAGEMAKER_APP_TYPE is set, indicating the server is running within a SageMaker
+  # app. Configure the base url to be `/<app-type-in-lower-case>/default`.
+  jupyter lab --ip 0.0.0.0 --port 8888 \
+    --ServerApp.base_url="/$SAGEMAKER_APP_TYPE_LOWERCASE/default" \
+    --ServerApp.token='' \
+    --ServerApp.allow_origin='*'
+else
+  jupyter lab --ip 0.0.0.0 --port 8888 \
+    --ServerApp.token='' \
+    --ServerApp.allow_origin='*'
+fi
diff --git a/build_artifacts/v2/v2.1/v2.1.1/gpu.arg_based_env.in b/build_artifacts/v2/v2.1/v2.1.1/gpu.arg_based_env.in
new file mode 100644
index 00000000..f4bd392f
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/gpu.arg_based_env.in
@@ -0,0 +1,6 @@
+conda-forge::cuda-compiler=$CUDA_MAJOR_MINOR_VERSION
+conda-forge::cuda-libraries=$CUDA_MAJOR_MINOR_VERSION
+conda-forge::cuda-libraries-dev=$CUDA_MAJOR_MINOR_VERSION
+conda-forge::cuda-nvml-dev=12.5.39
+conda-forge::cuda-command-line-tools=$CUDA_MAJOR_MINOR_VERSION
+conda-forge::gds-tools=1.10.0.4
diff --git a/build_artifacts/v2/v2.1/v2.1.1/gpu.env.in b/build_artifacts/v2/v2.1/v2.1.1/gpu.env.in
new file mode 100644
index 00000000..d5591eea
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/gpu.env.in
@@ -0,0 +1,57 @@
+# This file is auto-generated.
+conda-forge::jupyter-activity-monitor-extension[version='>=0.3.1,<0.4.0']
+conda-forge::mlflow[version='>=2.17.0,<2.18.0']
+conda-forge::sagemaker-mlflow[version='>=0.1.0,<0.2.0']
+conda-forge::langchain-aws[version='>=0.1.18,<0.2.0']
+conda-forge::jupyter-collaboration[version='>=2.1.4,<2.2.0']
+conda-forge::sagemaker-code-editor[version='>=1.3.3,<1.4.0']
+conda-forge::amazon-sagemaker-jupyter-ai-q-developer[version='>=1.0.12,<1.1.0']
+conda-forge::amazon-q-developer-jupyterlab-ext[version='>=3.4.0,<3.5.0']
+conda-forge::amazon_sagemaker_sql_editor[version='>=0.1.12,<0.2.0']
+conda-forge::amazon-sagemaker-sql-magic[version='>=0.1.3,<0.2.0']
+conda-forge::langchain[version='>=0.2.16,<0.3.0']
+conda-forge::fastapi[version='>=0.115.2,<0.116.0']
+conda-forge::uvicorn[version='>=0.32.0,<0.33.0']
+conda-forge::pytorch[version='>=2.3.1,<2.4.0']
+conda-forge::tensorflow[version='>=2.17.0,<2.18.0']
+conda-forge::python[version='>=3.11.10,<3.12.0']
+conda-forge::pip[version='>=24.2,<24.3.0']
+conda-forge::torchvision[version='>=0.18.1,<0.19.0']
+conda-forge::numpy[version='>=1.26.4,<1.27.0']
+conda-forge::pandas[version='>=2.2.3,<2.3.0']
+conda-forge::scikit-learn[version='>=1.5.2,<1.6.0']
+conda-forge::jinja2[version='>=3.1.4,<3.2.0']
+conda-forge::matplotlib-base[version='>=3.9.2,<3.10.0']
+conda-forge::sagemaker-headless-execution-driver[version='>=0.0.13,<0.1.0']
+conda-forge::ipython[version='>=8.28.0,<8.29.0']
+conda-forge::scipy[version='>=1.14.1,<1.15.0']
+conda-forge::keras[version='>=3.6.0,<3.7.0']
+conda-forge::py-xgboost-gpu[version='>=2.1.1,<2.2.0']
+conda-forge::jupyterlab[version='>=4.1.8,<4.2.0']
+conda-forge::ipywidgets[version='>=8.1.5,<8.2.0']
+conda-forge::conda[version='>=24.9.2,<24.10.0']
+conda-forge::boto3[version='>=1.34.162,<1.35.0']
+conda-forge::sagemaker-python-sdk[version='>=2.227.0,<2.228.0']
+conda-forge::supervisor[version='>=4.2.5,<4.3.0']
+conda-forge::autogluon[version='>=1.1.1,<1.2.0']
+conda-forge::aws-glue-sessions[version='>=1.0.7,<1.1.0']
+conda-forge::sagemaker-kernel-wrapper[version='>=0.0.4,<0.1.0']
+conda-forge::jupyter-ai[version='>=2.25.0,<2.26.0']
+conda-forge::jupyter-scheduler[version='>=2.9.0,<2.10.0']
+conda-forge::jupyter-lsp[version='>=2.2.5,<2.3.0']
+conda-forge::jupyterlab-lsp[version='>=5.0.3,<5.1.0']
+conda-forge::python-lsp-server[version='>=1.12.0,<1.13.0']
+conda-forge::notebook[version='>=7.1.3,<7.2.0']
+conda-forge::altair[version='>=5.4.1,<5.5.0']
+conda-forge::sagemaker-studio-analytics-extension[version='>=0.1.2,<0.2.0']
+conda-forge::jupyter-dash[version='>=0.4.2,<0.5.0']
+conda-forge::sagemaker-jupyterlab-extension[version='>=0.3.2,<0.4.0']
+conda-forge::sagemaker-jupyterlab-emr-extension[version='>=0.3.3,<0.4.0']
+conda-forge::amazon-sagemaker-jupyter-scheduler[version='>=3.1.6,<3.2.0']
+conda-forge::jupyter-server-proxy[version='>=4.4.0,<4.5.0']
+conda-forge::jupyterlab-git[version='>=0.50.1,<0.51.0']
+conda-forge::pyhive[version='>=0.7.0,<0.8.0']
+conda-forge::python-gssapi[version='>=1.9.0,<1.10.0']
+conda-forge::tf-keras[version='>=2.17.0,<2.18.0']
+conda-forge::git-remote-codecommit[version='>=1.16,<1.17.0']
+conda-forge::sentencepiece[version='>=0.1.99,<0.2.0']
diff --git a/build_artifacts/v2/v2.1/v2.1.1/patch_glue_pyspark.json b/build_artifacts/v2/v2.1/v2.1.1/patch_glue_pyspark.json
new file mode 100644
index 00000000..f92eee89
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/patch_glue_pyspark.json
@@ -0,0 +1,15 @@
+{
+  "argv": [
+    "/opt/conda/bin/python",
+    "-m",
+    "sagemaker_kernel_wrapper.sm_gis_wrapper",
+    "-m",
+    "aws_glue_interactive_sessions_kernel.glue_pyspark.GlueKernel",
+    "-f",
+    "{connection_file}"
+  ],
+  "display_name": "Glue PySpark",
+  "env": {"request_origin": "SageMakerStudioPySparkNotebook", "glue_version": "3.0"},
+  "language": "python"
+}
+
diff --git a/build_artifacts/v2/v2.1/v2.1.1/patch_glue_spark.json b/build_artifacts/v2/v2.1/v2.1.1/patch_glue_spark.json
new file mode 100644
index 00000000..1bd168e7
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/patch_glue_spark.json
@@ -0,0 +1,15 @@
+{
+  "argv": [
+    "/opt/conda/bin/python",
+    "-m",
+    "sagemaker_kernel_wrapper.sm_gis_wrapper",
+    "-m",
+    "aws_glue_interactive_sessions_kernel.glue_spark.GlueKernel",
+    "-f",
+    "{connection_file}"
+  ],
+  "display_name": "Glue Spark",
+  "env": {"request_origin": "SageMakerStudioSparkNotebook", "glue_version": "3.0"},
+  "language": "python"
+}
+
diff --git a/build_artifacts/v2/v2.1/v2.1.1/source-version.txt b/build_artifacts/v2/v2.1/v2.1.1/source-version.txt
new file mode 100644
index 00000000..50aea0e7
--- /dev/null
+++ b/build_artifacts/v2/v2.1/v2.1.1/source-version.txt
@@ -0,0 +1 @@
+2.1.0
\ No newline at end of file