diff --git a/src/anaconda/NOTES.md b/src/anaconda/NOTES.md
index 394dd6f1d..c380dc2c9 100644
--- a/src/anaconda/NOTES.md
+++ b/src/anaconda/NOTES.md
@@ -1,8 +1,42 @@
-## Using Conda
+## Using Conda and Mamba
 
-This Feature includes [the `conda` package manager](https://docs.conda.io/projects/conda/en/latest/index.html). Additional packages installed using Conda will be downloaded from Anaconda or another repository if you configure one. To reconfigure Conda in this container to access an alternative repository, please see information on [configuring Conda channels here](https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/channels.html ).
+This Feature includes [the `conda` package manager](https://docs.conda.io/projects/conda/en/latest/index.html) and optionally [the `mamba` package manager](https://mamba.readthedocs.io/en/latest/), which provides faster dependency resolution and package installation. Additional packages will be downloaded from Anaconda, conda-forge, or another repository if you configure one.
 
-Access to the Anaconda repository is covered by the [Anaconda Terms of Service](https://legal.anaconda.com/policies/en/?name=terms-of-service), which may require some organizations to obtain a commercial license from Anaconda. **However**, when used with GitHub Codespaces or GitHub Actions, **all users are permitted** to use the Anaconda Repository through the service, including organizations normally required by Anaconda to obtain a paid license for commercial activities. Note that third-party packages may be licensed by their publishers in ways that impact your intellectual property, and are used at your own risk.
+### Configuration Options
+
+This Feature offers several configuration options:
+
+- **useCondaForge**: Set to `true` (default) to use conda-forge as the default channel, which offers better package compatibility and more permissive licensing.
+- **installMamba**: Set to `true` (default) to install Mamba alongside Conda for faster package management.
+- **useSystemPackages**: Set to `true` (default) to use the system package manager on Debian/Ubuntu systems to install Conda.
+- **installFullAnaconda**: Set to `true` to install the full Anaconda distribution instead of the minimal Miniconda. Defaults to `false`.
+
+### Using Mamba
+
+When Mamba is installed, you can use the following commands and aliases for faster package management:
+
+```bash
+# Use mamba directly
+mamba install package-name
+
+# Use aliases that are automatically set up
+conda-fast install package-name
+cf install package-name
+```
+
+Mamba uses the same command syntax as conda but resolves dependencies much faster, especially for complex environments.
+
+### Conda Channels
+
+To reconfigure Conda in this container to access alternative repositories, please see information on [configuring Conda channels here](https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/channels.html).
+
+## Licensing Information
+
+Access to the Anaconda repository is covered by the [Anaconda Terms of Service](https://legal.anaconda.com/policies/en/?name=terms-of-service), which may require some organizations to obtain a commercial license from Anaconda. **However**, when used with GitHub Codespaces or GitHub Actions, **all users are permitted** to use the Anaconda Repository through the service, including organizations normally required by Anaconda to obtain a paid license for commercial activities. 
+
+If you've enabled the `useCondaForge` option (default), your container will use conda-forge as the default channel, which has more permissive licensing than the default Anaconda repository.
+
+Note that third-party packages may be licensed by their publishers in ways that impact your intellectual property, and are used at your own risk.
 
 ## Installing a different version of Python
 
@@ -10,11 +44,12 @@ As covered in the [user FAQ](https://docs.anaconda.com/anaconda/user-guide/faq)
 
 ```bash
 conda install python=3.7
+# Or faster with mamba
+mamba install python=3.7
 ```
 
-
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed. It also has limited support for RedHat-based systems, Alpine Linux, and openSUSE/SLES.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index 3346823b4..19657afc2 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -7,7 +7,7 @@
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/anaconda:1": {}
+    "ghcr.io/ran-dall/devcontainer-features/anaconda:1": {}
 }
 ```
 
@@ -16,12 +16,50 @@
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter an anaconda version. | string | latest |
+| useCondaForge | Set conda-forge as the default channel for better package compatibility | boolean | true |
+| installMamba | Install mamba for faster package management | boolean | true |
+| useSystemPackages | Use system package manager on Debian/Ubuntu systems to install Conda | boolean | true |
+| installFullAnaconda | Install full Anaconda distribution instead of minimal Miniconda | boolean | false |
 
-## Using Conda
+## Using Conda and Mamba
 
-This Feature includes [the `conda` package manager](https://docs.conda.io/projects/conda/en/latest/index.html). Additional packages installed using Conda will be downloaded from Anaconda or another repository if you configure one. To reconfigure Conda in this container to access an alternative repository, please see information on [configuring Conda channels here](https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/channels.html ).
+This Feature includes [the `conda` package manager](https://docs.conda.io/projects/conda/en/latest/index.html) and optionally [the `mamba` package manager](https://mamba.readthedocs.io/en/latest/), which provides faster dependency resolution and package installation. Additional packages will be downloaded from Anaconda, conda-forge, or another repository if you configure one.
 
-Access to the Anaconda repository is covered by the [Anaconda Terms of Service](https://legal.anaconda.com/policies/en/?name=terms-of-service), which may require some organizations to obtain a commercial license from Anaconda. **However**, when used with GitHub Codespaces or GitHub Actions, **all users are permitted** to use the Anaconda Repository through the service, including organizations normally required by Anaconda to obtain a paid license for commercial activities. Note that third-party packages may be licensed by their publishers in ways that impact your intellectual property, and are used at your own risk.
+### Configuration Options
+
+This Feature offers several configuration options:
+
+- **useCondaForge**: Set to `true` (default) to use conda-forge as the default channel, which offers better package compatibility and more permissive licensing.
+- **installMamba**: Set to `true` (default) to install Mamba alongside Conda for faster package management.
+- **useSystemPackages**: Set to `true` (default) to use the system package manager on Debian/Ubuntu systems to install Conda.
+- **installFullAnaconda**: Set to `true` to install the full Anaconda distribution instead of the minimal Miniconda. Defaults to `false`.
+
+### Using Mamba
+
+When Mamba is installed, you can use the following commands and aliases for faster package management:
+
+```bash
+# Use mamba directly
+mamba install package-name
+
+# Use aliases that are automatically set up
+conda-fast install package-name
+cf install package-name
+```
+
+Mamba uses the same command syntax as conda but resolves dependencies much faster, especially for complex environments.
+
+### Conda Channels
+
+To reconfigure Conda in this container to access alternative repositories, please see information on [configuring Conda channels here](https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/channels.html).
+
+## Licensing Information
+
+Access to the Anaconda repository is covered by the [Anaconda Terms of Service](https://legal.anaconda.com/policies/en/?name=terms-of-service), which may require some organizations to obtain a commercial license from Anaconda. **However**, when used with GitHub Codespaces or GitHub Actions, **all users are permitted** to use the Anaconda Repository through the service, including organizations normally required by Anaconda to obtain a paid license for commercial activities. 
+
+If you've enabled the `useCondaForge` option (default), your container will use conda-forge as the default channel, which has more permissive licensing than the default Anaconda repository.
+
+Note that third-party packages may be licensed by their publishers in ways that impact your intellectual property, and are used at your own risk.
 
 ## Installing a different version of Python
 
@@ -29,16 +67,17 @@ As covered in the [user FAQ](https://docs.anaconda.com/anaconda/user-guide/faq)
 
 ```bash
 conda install python=3.7
+# Or faster with mamba
+mamba install python=3.7
 ```
 
-
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed. It also has limited support for RedHat-based systems, Alpine Linux, and openSUSE/SLES.
 
 `bash` is required to execute the `install.sh` script.
 
 
 ---
 
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/anaconda/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/ran-dall/devcontainer-features/blob/main/src/anaconda/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index 6b92b9147..848096287 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "anaconda",
-    "version": "1.0.12",
+    "version": "1.1.0",
     "name": "Anaconda",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
     "options": {
@@ -11,11 +11,31 @@
             ],
             "default": "latest",
             "description": "Select or enter an anaconda version."
+        },
+        "useCondaForge": {
+            "type": "boolean",
+            "default": true,
+            "description": "Set conda-forge as the default channel for better package compatibility"
+        },
+        "installMamba": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install mamba for faster package management"
+        },
+        "useSystemPackages": {
+            "type": "boolean",
+            "default": true,
+            "description": "Use system package manager on Debian/Ubuntu systems to install Conda"
+        },
+        "installFullAnaconda": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install full Anaconda distribution instead of minimal Miniconda"
         }
     },
     "containerEnv": {
         "CONDA_DIR": "/usr/local/conda",
-        "PATH": "/usr/local/conda/bin:${PATH}"
+        "PATH": "/usr/local/conda/bin:/opt/conda/bin:${PATH}"
     },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 7c7af5b00..67e9bf379 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -8,117 +8,517 @@
 # Maintainer: The VS Code and Codespaces Teams
 
 
-VERSION="${VERSION:-"latest"}"
-USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
-UPDATE_RC="${UPDATE_RC:-"true"}"
-CONDA_DIR="${CONDA_DIR:-"/usr/local/conda"}"
-
-set -eux
-export DEBIAN_FRONTEND=noninteractive
-
-# Clean up
-rm -rf /var/lib/apt/lists/*
+# Initialize environment variables with defaults
+initialize_environment() {
+    VERSION="${VERSION:-"latest"}"
+    USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+    UPDATE_RC="${UPDATE_RC:-"true"}"
+    CONDA_DIR="${CONDA_DIR:-"/usr/local/conda"}"
+    
+    # Map camelCase options to uppercase environment variables 
+    # for backwards compatibility with internal script logic
+    USE_CONDA_FORGE="${useCondaForge:-"true"}"
+    INSTALL_MAMBA="${installMamba:-"true"}"
+    USE_SYSTEM_PACKAGES="${useSystemPackages:-"true"}"
+    INSTALL_FULL_ANACONDA="${installFullAnaconda:-"false"}"
+    
+    # Ensure boolean values are properly set
+    if [ "${INSTALL_MAMBA}" = "false" ] || [ "${INSTALL_MAMBA}" = "False" ] || [ "${INSTALL_MAMBA}" = "0" ]; then
+        INSTALL_MAMBA="false"
+    else
+        INSTALL_MAMBA="true"
+    fi
+    
+    if [ "${USE_CONDA_FORGE}" = "false" ] || [ "${USE_CONDA_FORGE}" = "False" ] || [ "${USE_CONDA_FORGE}" = "0" ]; then
+        USE_CONDA_FORGE="false"
+    else
+        USE_CONDA_FORGE="true"
+    fi
+    
+    if [ "${USE_SYSTEM_PACKAGES}" = "false" ] || [ "${USE_SYSTEM_PACKAGES}" = "False" ] || [ "${USE_SYSTEM_PACKAGES}" = "0" ]; then
+        USE_SYSTEM_PACKAGES="false"
+    else
+        USE_SYSTEM_PACKAGES="true"
+    fi
+    
+    if [ "${INSTALL_FULL_ANACONDA}" = "false" ] || [ "${INSTALL_FULL_ANACONDA}" = "False" ] || [ "${INSTALL_FULL_ANACONDA}" = "0" ]; then
+        INSTALL_FULL_ANACONDA="false"
+    else
+        INSTALL_FULL_ANACONDA="true"
+    fi
+    
+    echo "Configuration options:"
+    echo "- VERSION: ${VERSION}"
+    echo "- USE_CONDA_FORGE: ${USE_CONDA_FORGE}"
+    echo "- INSTALL_MAMBA: ${INSTALL_MAMBA}"
+    echo "- USE_SYSTEM_PACKAGES: ${USE_SYSTEM_PACKAGES}"
+    echo "- INSTALL_FULL_ANACONDA: ${INSTALL_FULL_ANACONDA}"
+    
+    set -eux
+    
+    # Determine architecture - use dpkg if available, otherwise use uname
+    if type dpkg >/dev/null 2>&1; then
+        architecture=$(dpkg --print-architecture)
+    else
+        architecture="$(uname -m)"
+        case "${architecture}" in
+            x86_64) architecture="amd64" ;;
+            aarch64) architecture="arm64" ;;
+        esac
+    fi
+    
+    # Convert architecture to Anaconda format
+    case "${architecture}" in 
+        amd64) architecture="x86_64" ;; 
+        arm64) architecture="aarch64" ;; 
+        *) 
+            echo "Anaconda does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine." 
+            exit 1 
+        ;;
+    esac
+    
+    # Determine package manager
+    package_manager=""
+    if type apt >/dev/null 2>&1; then
+        package_manager="apt"
+    elif type apt-get >/dev/null 2>&1; then
+        package_manager="apt-get"
+    elif type dnf >/dev/null 2>&1; then
+        package_manager="dnf"
+    elif type yum >/dev/null 2>&1; then
+        package_manager="yum"
+    elif type zypper >/dev/null 2>&1; then
+        package_manager="zypper"
+    elif type apk >/dev/null 2>&1; then
+        package_manager="apk"
+    fi
+    
+    echo "Detected architecture: ${architecture}"
+    echo "Detected package manager: ${package_manager:-none}"
+    
+    # Clean up any existing package lists
+    rm -rf /var/lib/apt/lists/*
+}
 
-if [ "$(id -u)" -ne 0 ]; then
-    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
-    exit 1
-fi
+# Verify the script is run as root
+ensure_root() {
+    if [ "$(id -u)" -ne 0 ]; then
+        echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+        exit 1
+    fi
+}
 
-# Ensure that login shells get the correct path if the user updated the PATH using ENV.
-rm -f /etc/profile.d/00-restore-env.sh
-echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
-chmod +x /etc/profile.d/00-restore-env.sh
+# Setup the environment path for login shells
+setup_environment_path() {
+    rm -f /etc/profile.d/00-restore-env.sh
+    echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
+    chmod +x /etc/profile.d/00-restore-env.sh
+}
 
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
-            USERNAME="${CURRENT_USER}"
-            break
+resolve_username() {
+    local resolved_username=""
+    
+    if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+        possible_users=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+        for current_user in "${possible_users[@]}"; do
+            if id -u "${current_user}" > /dev/null 2>&1; then
+                resolved_username="${current_user}"
+                break
+            fi
+        done
+        if [ "${resolved_username}" = "" ]; then
+            resolved_username=root
         fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
+    elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+        resolved_username=root
+    else
+        resolved_username="${USERNAME}"
     fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+    
+    echo "${resolved_username}"
+}
 
-architecture="$(uname -m)"
-if [ "${architecture}" != "x86_64" ]; then
-    echo "(!) Architecture $architecture unsupported"
-    exit 1
-fi
+# Detect platform type for optimized installation
+detect_platform() {
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS=$NAME
+        ID=$ID
+        
+        # Check if we're on Debian or Ubuntu
+        if [[ "$OS" == *"Debian"* ]] || [[ "$OS" == *"Ubuntu"* ]] || [ "$ID" = "debian" ] || [ "$ID" = "ubuntu" ]; then
+            echo "debian_based"
+        elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "centos" ] || [ "$ID" = "rocky" ] || [ "$ID" = "almalinux" ]; then
+            echo "redhat_based"
+        elif [ "$ID" = "alpine" ]; then
+            echo "alpine_based"
+        elif [ "$ID" = "opensuse-leap" ] || [ "$ID" = "opensuse-tumbleweed" ] || [ "$ID" = "sles" ]; then
+            echo "suse_based"
+        else
+            echo "generic"
+        fi
+    else
+        echo "generic"
+    fi
+}
 
-updaterc() {
+# Function to run commands as a specific user safely
+run_as_user() {
+    local user="$1"
+    local cmd="$2"
+    
+    # Skip running as a different user if we're already that user
+    if [ "$(id -u)" = "$(id -u $user)" ]; then
+        bash -c "$cmd"
+        return $?
+    fi
+    
+    # Try different methods to run as user
+    if command -v su >/dev/null 2>&1; then
+        # Use su if available
+        su --login -c "$cmd" "$user"
+    elif command -v runuser >/dev/null 2>&1; then
+        # Use runuser if available (more common on RHEL/CentOS/Fedora)
+        runuser -l "$user" -c "$cmd"
+    elif command -v sudo >/dev/null 2>&1; then
+        # Use sudo if available
+        sudo -u "$user" bash -c "$cmd"
+    else
+        # If no user switching tool is available, just run as current user
+        echo "Warning: Unable to run command as user $user - running as current user instead"
+        bash -c "$cmd"
+    fi
+    
+    return $?
+}
+
+# Update shell rc files with provided content
+update_rc_files() {
+    local content="$1"
+    
     if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
+        if [ -f /etc/bash.bashrc ] && [[ "$(cat /etc/bash.bashrc)" != *"$content"* ]]; then
+            echo -e "$content" >> /etc/bash.bashrc
+        fi
+        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$content"* ]]; then
+            echo -e "$content" >> /etc/zsh/zshrc
         fi
-        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/zsh/zshrc
+        # For systems that don't have these files
+        if [ ! -f /etc/bash.bashrc ] && [ -f /etc/bashrc ]; then
+            if [[ "$(cat /etc/bashrc)" != *"$content"* ]]; then
+                echo -e "$content" >> /etc/bashrc
+            fi
         fi
     fi
 }
 
-# Checks if packages are installed and installs them if not
-check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-            echo "Running apt-get update..."
-            apt-get update -y
-        fi
-        apt-get -y install --no-install-recommends "$@"
-    fi
+# Install required system packages using the appropriate package manager
+install_required_packages() {
+    local packages=("$@")
+    
+    case "$package_manager" in
+        apt)
+            # For Debian/Ubuntu with modern apt
+            if ! dpkg -s "${packages[@]}" > /dev/null 2>&1; then
+                if [ "$(find /var/lib/apt/lists/* 2>/dev/null | wc -l)" = "0" ]; then
+                    apt update -y
+                fi
+                apt -y install --no-install-recommends "${packages[@]}"
+            fi
+            ;;
+        apt-get)
+            # For older Debian/Ubuntu
+            if ! dpkg -s "${packages[@]}" > /dev/null 2>&1; then
+                if [ "$(find /var/lib/apt/lists/* 2>/dev/null | wc -l)" = "0" ]; then
+                    apt-get update -y
+                fi
+                apt-get -y install --no-install-recommends "${packages[@]}"
+            fi
+            ;;
+        dnf)
+            # For Fedora/RHEL/CentOS 8+
+            dnf -y install "${packages[@]}"
+            ;;
+        yum)
+            # For older RHEL/CentOS
+            yum -y install "${packages[@]}"
+            ;;
+        zypper)
+            # For openSUSE/SLES
+            zypper -n install "${packages[@]}"
+            ;;
+        apk)
+            # For Alpine
+            apk add --no-cache "${packages[@]}"
+            ;;
+        *)
+            echo "WARNING: Unsupported package manager. Manual installation of requirements needed."
+            # Try to continue without installing packages
+            ;;
+    esac
 }
 
-# Install Conda if it's missing
-if ! conda --version &> /dev/null ; then
+# Prepare the conda directory with proper permissions
+prepare_conda_directory() {
+    local resolved_username="$1"
+    
     if ! cat /etc/group | grep -e "^conda:" > /dev/null 2>&1; then
         groupadd -r conda
     fi
-    usermod -a -G conda "${USERNAME}"
-
-    # Install dependencies
-    check_packages wget ca-certificates
+    usermod -a -G conda "${resolved_username}"
 
     mkdir -p $CONDA_DIR
-    chown -R "${USERNAME}:conda" "${CONDA_DIR}"
+    chown -R "${resolved_username}:conda" "${CONDA_DIR}"
     chmod -R g+r+w "${CONDA_DIR}"
     
     find "${CONDA_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
-    echo "Installing Anaconda..."
+}
+
+# Install base Conda using the system's package manager (Debian/Ubuntu)
+install_conda_debian() {
+    local resolved_username="$1"
+    
+    echo "Installing Conda via system package manager..."
+    
+    # Add the repository keys
+    install_required_packages curl ca-certificates gnupg2
+    curl -sS https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > /usr/share/keyrings/conda-archive-keyring.gpg
+    
+    # Add conda repository
+    echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" > /etc/apt/sources.list.d/conda.list
+    
+    # Use appropriate apt command based on what's available
+    if [ "$package_manager" = "apt" ]; then
+        apt update -y
+    else
+        apt-get update -y
+    fi
+    
+    # Install conda package
+    local conda_pkg="conda"
+    if [ "${VERSION}" != "latest" ] && [ "${VERSION}" != "lts" ]; then
+        conda_pkg="conda=${VERSION}-0"
+    fi
+    
+    if [ "$package_manager" = "apt" ]; then
+        if apt -y install --no-install-recommends $conda_pkg; then
+            setup_conda_after_debian_install "$resolved_username"
+            return 0
+        else
+            echo "Falling back to direct installation..."
+            return 1
+        fi
+    else
+        if apt-get -y install --no-install-recommends $conda_pkg; then
+            setup_conda_after_debian_install "$resolved_username"
+            return 0
+        else
+            echo "Falling back to direct installation..."
+            return 1
+        fi
+    fi
+}
 
-    CONDA_VERSION=$VERSION
-    if [ "${VERSION}" = "latest" ] || [ "${VERSION}" = "lts" ]; then
-        CONDA_VERSION="2021.11"
+# Helper function to set up conda after Debian installation
+setup_conda_after_debian_install() {
+    local resolved_username="$1"
+    
+    # Set up conda properly
+    local debian_conda_dir="/opt/conda"
+    
+    # Create a symlink if CONDA_DIR is different from the default
+    if [ "$debian_conda_dir" != "$CONDA_DIR" ]; then
+        ln -sf $debian_conda_dir $CONDA_DIR
+    fi
+    
+    # First add the directory to the PATH so that we can access conda
+    export PATH="$debian_conda_dir/bin:$PATH"
+    
+    # Check if the conda command is accessible now
+    if command -v conda >/dev/null 2>&1; then
+        # Initialize for the user using the direct path
+        run_as_user "$resolved_username" "${debian_conda_dir}/bin/conda init bash"
+        if [ -f "/etc/zsh/zshrc" ]; then
+            run_as_user "$resolved_username" "${debian_conda_dir}/bin/conda init zsh"
+        fi
+        
+        # Set CONDA_SCRIPT environment variable to help with testing
+        echo "export CONDA_SCRIPT=\"${debian_conda_dir}/etc/profile.d/conda.sh\"" > /etc/profile.d/02-conda-script.sh
+        chmod +x /etc/profile.d/02-conda-script.sh
+        export CONDA_SCRIPT="${debian_conda_dir}/etc/profile.d/conda.sh"
+        
+        return 0
+    else
+        echo "Conda command not found after installation. Falling back to direct installation."
+        return 1
     fi
+}
 
-    su --login -c "export http_proxy=${http_proxy:-} && export https_proxy=${https_proxy:-} \
-        && wget -q https://repo.anaconda.com/archive/Anaconda3-${CONDA_VERSION}-Linux-x86_64.sh -O /tmp/anaconda-install.sh \
-        && /bin/bash /tmp/anaconda-install.sh -u -b -p ${CONDA_DIR}" ${USERNAME} 2>&1 
+# Install the minimal Conda distribution (Miniconda)
+install_miniconda() {
+    local resolved_username="$1"
+    
+    echo "Installing Miniconda..."
     
-    if [ "${VERSION}" = "latest" ] || [ "${VERSION}" = "lts" ]; then
+    # Download the installer directly as root
+    export http_proxy=${http_proxy:-}
+    export https_proxy=${https_proxy:-}
+    wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-${architecture}.sh -O /tmp/miniconda-install.sh
+    
+    # Run the installer script
+    bash /tmp/miniconda-install.sh -u -b -p ${CONDA_DIR}
+    
+    # Fix permissions
+    chown -R "${resolved_username}:conda" "${CONDA_DIR}"
+    
+    # Initialize conda for both bash and zsh
+    run_as_user "$resolved_username" "${CONDA_DIR}/bin/conda init bash"
+    if [ -f "/etc/zsh/zshrc" ]; then
+        run_as_user "$resolved_username" "${CONDA_DIR}/bin/conda init zsh"
+    fi
+    
+    # Update conda to the latest version
+    PATH=$PATH:${CONDA_DIR}/bin
+    conda update -y conda
+    
+    # Set CONDA_SCRIPT environment variable to help with testing
+    echo "export CONDA_SCRIPT=\"${CONDA_DIR}/etc/profile.d/conda.sh\"" > /etc/profile.d/02-conda-script.sh
+    chmod +x /etc/profile.d/02-conda-script.sh
+    export CONDA_SCRIPT="${CONDA_DIR}/etc/profile.d/conda.sh"
+    
+    rm /tmp/miniconda-install.sh
+}
+
+# Install the full Anaconda distribution
+install_anaconda() {
+    local resolved_username="$1"
+    local version="$2"
+    
+    local anaconda_version=$version
+    if [ "${version}" = "latest" ] || [ "${version}" = "lts" ]; then
+        # Use the latest version if "latest" is specified for Anaconda
+        anaconda_version="2024.10-1"
+    fi
+    
+    echo "Installing full Anaconda distribution..."
+    
+    # Download the installer directly as root
+    export http_proxy=${http_proxy:-}
+    export https_proxy=${https_proxy:-}
+    wget -q https://repo.anaconda.com/archive/Anaconda3-${anaconda_version}-Linux-${architecture}.sh -O /tmp/anaconda-install.sh
+    
+    # Run the installer script
+    bash /tmp/anaconda-install.sh -u -b -p ${CONDA_DIR}
+    
+    # Fix permissions
+    chown -R "${resolved_username}:conda" "${CONDA_DIR}"
+    
+    # Initialize conda for both bash and zsh
+    run_as_user "$resolved_username" "${CONDA_DIR}/bin/conda init bash"
+    if [ -f "/etc/zsh/zshrc" ]; then
+        run_as_user "$resolved_username" "${CONDA_DIR}/bin/conda init zsh"
+    fi
+    
+    # Update conda to the latest version if we're using "latest"
+    if [ "${version}" = "latest" ] || [ "${version}" = "lts" ]; then
         PATH=$PATH:${CONDA_DIR}/bin
         conda update -y conda
     fi
+    
+    # Set CONDA_SCRIPT environment variable to help with testing
+    echo "export CONDA_SCRIPT=\"${CONDA_DIR}/etc/profile.d/conda.sh\"" > /etc/profile.d/02-conda-script.sh
+    chmod +x /etc/profile.d/02-conda-script.sh
+    export CONDA_SCRIPT="${CONDA_DIR}/etc/profile.d/conda.sh"
+    
+    rm /tmp/anaconda-install.sh
+}
 
-    rm /tmp/anaconda-install.sh 
-    updaterc "export CONDA_DIR=${CONDA_DIR}/bin"
-fi
+# Configure conda with appropriate settings including channels
+configure_conda() {
+    echo "Configuring conda..."
+    
+    # Add both possible Conda paths to ensure we can find the binary
+    export PATH="/opt/conda/bin:${CONDA_DIR}/bin:$PATH"
+    
+    # First check if conda is available
+    if ! command -v conda >/dev/null 2>&1; then
+        echo "Warning: conda command not found, configuration skipped"
+        return 1
+    fi
+    
+    # Set environment prompt format
+    conda config --set env_prompt '({name})'
+    
+    # Configure conda-forge channel if requested
+    if [ "${USE_CONDA_FORGE}" = "true" ]; then
+        echo "Setting up conda-forge as the default channel..."
+        conda config --add channels conda-forge
+        conda config --set channel_priority strict
+    fi
+    
+    # Configure conda to use libmamba solver for better performance
+    # Note: This does NOT install mamba itself, just configures the solver if mamba is installed
+    if [ "${INSTALL_MAMBA}" = "true" ]; then
+        echo "Setting libmamba as the default solver for conda..."
+        conda config --set solver libmamba
+    fi
+}
+
+# Install mamba for faster package management
+install_mamba() {
+    echo "Installing mamba for faster package management..."
+    
+    # Add both possible Conda paths to ensure we can find the binary
+    export PATH="/opt/conda/bin:${CONDA_DIR}/bin:$PATH"
+    
+    # Check if conda is available
+    if ! command -v conda >/dev/null 2>&1; then
+        echo "Warning: conda command not found, mamba installation skipped"
+        return 1
+    fi
+    
+    conda install -y -c conda-forge mamba
+    
+    # Add helpful aliases to make it easy to use either conda or mamba
+    update_rc_files "# Mamba aliases for faster package management\nalias conda-fast='mamba'\nalias cf='mamba'"
+}
 
-# Display a notice on conda when not running in GitHub Codespaces
-mkdir -p /usr/local/etc/vscode-dev-containers
-cat << 'EOF' > /usr/local/etc/vscode-dev-containers/conda-notice.txt
+# Setup conda configuration and shell integration
+setup_conda_shell_integration() {
+    # Add conda to path in RC files
+    update_rc_files "export PATH=\$PATH:${CONDA_DIR}/bin"
+    update_rc_files "export CONDA_DIR=${CONDA_DIR}"
+    
+    # Set up automatic environment activation
+    update_rc_files "if [ -f \"${CONDA_DIR}/etc/profile.d/conda.sh\" ]; then . \"${CONDA_DIR}/etc/profile.d/conda.sh\"; fi"
+    
+    # Add useful conda aliases
+    update_rc_files "# Useful conda aliases\nalias ca='conda activate'\nalias cda='conda deactivate'\nalias cen='conda env list'\nalias cre='conda env create -f'"
+}
+
+# Create notice about conda licensing for non-Codespaces environments
+create_conda_notice() {
+    local using_conda_forge="$1"
+    
+    mkdir -p /usr/local/etc/vscode-dev-containers
+    
+    if [ "${using_conda_forge}" = "true" ]; then
+        cat << 'EOF' > /usr/local/etc/vscode-dev-containers/conda-notice.txt
 When using "conda" from outside of GitHub Codespaces, note the Anaconda repository contains
 restrictions on commercial use that may impact certain organizations. See https://aka.ms/ghcs-conda
 
+Note: This container is using conda-forge as the default channel, which has more
+permissive licensing than the default Anaconda repository.
+EOF
+    else
+        cat << 'EOF' > /usr/local/etc/vscode-dev-containers/conda-notice.txt
+When using "conda" from outside of GitHub Codespaces, note the Anaconda repository contains
+restrictions on commercial use that may impact certain organizations. See https://aka.ms/ghcs-conda
 EOF
+    fi
 
-notice_script="$(cat << 'EOF'
+    notice_script="$(cat << 'EOF'
 if [ -t 1 ] && [ "${IGNORE_NOTICE}" != "true" ] && [ "${TERM_PROGRAM}" = "vscode" ] && [ "${CODESPACES}" != "true" ] && [ ! -f "$HOME/.config/vscode-dev-containers/conda-notice-already-displayed" ]; then
     cat "/usr/local/etc/vscode-dev-containers/conda-notice.txt"
     mkdir -p "$HOME/.config/vscode-dev-containers"
@@ -127,15 +527,130 @@ fi
 EOF
 )"
 
-if [ -f "/etc/zsh/zshrc" ]; then
-    echo "${notice_script}" | tee -a /etc/zsh/zshrc
-fi
+    if [ -f "/etc/zsh/zshrc" ]; then
+        echo "${notice_script}" | tee -a /etc/zsh/zshrc
+    fi
 
-if [ -f "/etc/bash.bashrc" ]; then
-    echo "${notice_script}" | tee -a /etc/bash.bashrc
-fi
+    if [ -f "/etc/bash.bashrc" ]; then
+        echo "${notice_script}" | tee -a /etc/bash.bashrc
+    fi
+    
+    # Handle different shell configurations in different distributions
+    if [ ! -f /etc/bash.bashrc ] && [ -f /etc/bashrc ]; then
+        echo "${notice_script}" | tee -a /etc/bashrc
+    fi
+}
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
+# Clean up the system after installation
+cleanup_system() {
+    # Clean up based on the package manager
+    case "$package_manager" in
+        apt)
+            apt clean
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        apt-get)
+            apt-get clean
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        dnf)
+            dnf clean all
+            ;;
+        yum)
+            yum clean all
+            ;;
+        zypper)
+            zypper clean -a
+            ;;
+        apk)
+            # No cleanup needed for apk
+            ;;
+    esac
+    
+    echo "Done!"
+}
+
+# Main function to orchestrate the installation process
+main() {
+    initialize_environment
+    ensure_root
+    setup_environment_path
+    
+    local resolved_username=$(resolve_username)
+    local platform=$(detect_platform)
+    
+    # Install dependencies based on the platform
+    case "$platform" in
+        debian_based)
+            # Set Debian frontend to noninteractive for Debian/Ubuntu
+            export DEBIAN_FRONTEND=noninteractive
+            install_required_packages wget curl ca-certificates gnupg2
+            ;;
+        redhat_based)
+            install_required_packages wget curl ca-certificates gnupg2
+            ;;
+        alpine_based)
+            install_required_packages wget curl ca-certificates gnupg
+            ;;
+        suse_based)
+            install_required_packages wget curl ca-certificates gnupg2
+            ;;
+        *)
+            # Try a basic set of packages that might work
+            install_required_packages wget curl ca-certificates gnupg2 || true
+            ;;
+    esac
+    
+    prepare_conda_directory "${resolved_username}"
+    
+    # Install conda if it's not already installed
+    if ! command -v conda &> /dev/null; then
+        # Try to use system packages on Debian/Ubuntu if USE_SYSTEM_PACKAGES is true
+        if [ "$platform" = "debian_based" ] && [ "${USE_SYSTEM_PACKAGES}" = "true" ]; then
+            if install_conda_debian "${resolved_username}"; then
+                # Successfully installed using Debian package manager
+                echo "Conda installed via system package manager."
+            else
+                # Fall back to direct installation
+                if [ "${INSTALL_FULL_ANACONDA}" = "true" ]; then
+                    # Install full Anaconda if requested
+                    install_anaconda "${resolved_username}" "${VERSION}"
+                else
+                    # Otherwise install Miniconda (minimal installation)
+                    install_miniconda "${resolved_username}"
+                fi
+            fi
+        else
+            # Direct installation for non-Debian/Ubuntu or when USE_SYSTEM_PACKAGES is false
+            if [ "${INSTALL_FULL_ANACONDA}" = "true" ]; then
+                # Install full Anaconda if requested
+                install_anaconda "${resolved_username}" "${VERSION}"
+            else
+                # Otherwise install Miniconda (minimal installation)
+                install_miniconda "${resolved_username}"
+            fi
+        fi
+        
+        # Configure the newly installed conda
+        configure_conda
+        setup_conda_shell_integration
+    else
+        echo "Conda is already installed."
+        # Configure the existing conda
+        configure_conda
+    fi
+    
+    # Install mamba if requested - only install if INSTALL_MAMBA is true
+    if [ "${INSTALL_MAMBA}" = "true" ]; then
+        echo "Installing mamba (installMamba=${INSTALL_MAMBA})..."
+        install_mamba
+    else
+        echo "Skipping mamba installation (installMamba=${INSTALL_MAMBA})..."
+    fi
+    
+    create_conda_notice "${USE_CONDA_FORGE}"
+    cleanup_system
+}
 
-echo "Done!"
+# Execute the main function
+main
diff --git a/test/anaconda/debian_based.sh b/test/anaconda/debian_based.sh
new file mode 100644
index 000000000..0f9853f22
--- /dev/null
+++ b/test/anaconda/debian_based.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Check the OS release information for diagnostic purposes
+echo "OS release information:"
+cat /etc/os-release
+
+# Show conda configuration and packages for diagnostic purposes
+echo "Conda channels configuration:"
+conda config --show channels
+
+echo "Installed packages in base environment:"
+conda list -n base | grep -E "mamba|libmamba" || echo "No mamba packages found"
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/default.sh b/test/anaconda/default.sh
new file mode 100644
index 000000000..1459093b1
--- /dev/null
+++ b/test/anaconda/default.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Basic conda installation test
+check "conda version" conda --version
+check "notice file exists" test -f /usr/local/etc/vscode-dev-containers/conda-notice.txt
+check "conda-forge channel" conda config --show channels | grep conda-forge
+check "mamba installed" conda list -n base | grep mamba
+
+# Report results
+reportResults
diff --git a/test/anaconda/devcontainer-feature.json b/test/anaconda/devcontainer-feature.json
new file mode 100644
index 000000000..ce1687d8a
--- /dev/null
+++ b/test/anaconda/devcontainer-feature.json
@@ -0,0 +1,43 @@
+{
+    "id": "anaconda",
+    "version": "1.1.0",
+    "name": "Anaconda",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest"
+            ],
+            "default": "latest",
+            "description": "Select or enter an anaconda version."
+        },
+        "USE_CONDA_FORGE": {
+            "type": "boolean",
+            "default": true,
+            "description": "Set conda-forge as the default channel for better package compatibility"
+        },
+        "INSTALL_MAMBA": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install mamba for faster package management"
+        },
+        "USE_SYSTEM_PACKAGES": {
+            "type": "boolean",
+            "default": true,
+            "description": "Use system package manager on Debian/Ubuntu systems to install Conda"
+        },
+        "INSTALL_FULL_ANACONDA": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install full Anaconda distribution instead of minimal Miniconda"
+        }
+    },
+    "containerEnv": {
+        "CONDA_DIR": "/usr/local/conda",
+        "PATH": "/usr/local/conda/bin:/opt/conda/bin:${PATH}"
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
+}
diff --git a/test/anaconda/full_anaconda.sh b/test/anaconda/full_anaconda.sh
new file mode 100644
index 000000000..ba4a138ed
--- /dev/null
+++ b/test/anaconda/full_anaconda.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test that conda is installed and working
+check "conda is available" conda --version
+
+# Check package count as a proxy for full Anaconda
+echo "Listing installed packages:"
+conda list -n base
+
+# Count packages as a proxy for full Anaconda vs Miniconda
+pkg_count=$(conda list -n base | grep -v "^#" | wc -l)
+echo "Package count: $pkg_count"
+
+# Just check that the installation completed and conda works
+echo "Conda installation test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/miniconda_only.sh b/test/anaconda/miniconda_only.sh
new file mode 100644
index 000000000..87609b3e5
--- /dev/null
+++ b/test/anaconda/miniconda_only.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Count packages for diagnostic purposes
+pkg_count=$(conda list -n base | grep -v "^#" | wc -l)
+echo "Package count: $pkg_count"
+
+# Look for anaconda package for diagnostic purposes
+echo "Checking for anaconda package:"
+conda list -n base | grep -E "^anaconda\s+" || echo "Anaconda package not found (expected for miniconda)"
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/no_system_packages.sh b/test/anaconda/no_system_packages.sh
new file mode 100644
index 000000000..71407a878
--- /dev/null
+++ b/test/anaconda/no_system_packages.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Check installation directory for diagnostic purposes
+echo "Checking conda installation directory:"
+ls -la /usr/local/conda || echo "Directory /usr/local/conda not found"
+ls -la /opt/conda || echo "Directory /opt/conda not found"
+
+if [ -L "/usr/local/conda" ]; then
+    echo "/usr/local/conda is a symbolic link pointing to: $(readlink /usr/local/conda)"
+else
+    echo "/usr/local/conda is a regular directory"
+fi
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/non_debian_based.sh b/test/anaconda/non_debian_based.sh
new file mode 100644
index 000000000..d7211157f
--- /dev/null
+++ b/test/anaconda/non_debian_based.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Check OS information for diagnostic purposes
+echo "OS release information:"
+cat /etc/os-release
+
+# Check installation directory for diagnostic purposes
+echo "Checking conda installation directory:"
+ls -la /usr/local/conda || echo "Directory /usr/local/conda not found"
+
+# Show conda configuration and packages for diagnostic purposes
+echo "Conda channels configuration:"
+conda config --show channels
+
+echo "Installed packages in base environment:"
+conda list -n base | grep -E "mamba|libmamba" || echo "No mamba packages found"
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/scenarios.json b/test/anaconda/scenarios.json
new file mode 100644
index 000000000..b217e6a3c
--- /dev/null
+++ b/test/anaconda/scenarios.json
@@ -0,0 +1,86 @@
+{
+    "specific_version": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "version": "24.5.0"
+            }
+        }
+    },
+    "with_conda_forge": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "useCondaForge": "true"
+            }
+        }
+    },
+    "without_conda_forge": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "useCondaForge": "false"
+            }
+        }
+    },
+    "with_mamba": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "installMamba": "true"
+            }
+        }
+    },
+    "without_mamba": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "installMamba": "false"
+            }
+        }
+    },
+    "with_libmamba_solver": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "installMamba": "true"
+            }
+        }
+    },
+    "full_anaconda": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "installFullAnaconda": "true"
+            }
+        }
+    },
+    "miniconda_only": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "installFullAnaconda": "false"
+            }
+        }
+    },
+    "no_system_packages": {
+        "image": "ubuntu:focal",
+        "features": {
+            "anaconda": {
+                "useSystemPackages": "false"
+            }
+        }
+    },
+    "debian_based": {
+        "image": "debian:bullseye",
+        "features": {
+            "anaconda": {}
+        }
+    },
+    "non_debian_based": {
+        "image": "fedora:latest",
+        "features": {
+            "anaconda": {}
+        }
+    }
+}
diff --git a/test/anaconda/specific_version.sh b/test/anaconda/specific_version.sh
new file mode 100644
index 000000000..4992afc13
--- /dev/null
+++ b/test/anaconda/specific_version.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Specifically test for mamba installation
+echo "Checking for mamba package..."
+if conda list -n base | grep -E "^mamba\s+"; then
+    echo "Found mamba package as expected"
+    check "mamba is installed" true
+else
+    echo "Error: mamba package not found but should be installed"
+    check "mamba is installed" false
+fi
+
+# Try running mamba command
+echo "Testing mamba command..."
+if command -v mamba >/dev/null 2>&1; then
+    mamba --version
+    check "mamba command works" true
+else
+    echo "Error: mamba command not found but should be available"
+    check "mamba command works" false
+fi
+
+# Report results
+reportResults
diff --git a/test/anaconda/test.sh b/test/anaconda/test.sh
index c2eafe056..80e8b39ef 100755
--- a/test/anaconda/test.sh
+++ b/test/anaconda/test.sh
@@ -2,12 +2,29 @@
 
 set -e
 
-# Optional: Import test library
+# Import test library
 source dev-container-features-test-lib
 
-# Definition specific tests
-check "version" conda --version
-check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
 
-# Report result
-reportResults
\ No newline at end of file
+# Basic conda installation tests
+check "conda version check" conda --version
+check "conda notice file exists" test -f /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+# Show conda configuration and packages for diagnostic purposes
+echo "Conda channels configuration:"
+conda config --show channels
+
+echo "Channel priority configuration:"
+conda config --show channel_priority
+
+echo "Installed packages in base environment:"
+conda list -n base
+
+# Test basic conda functionality
+check "conda can list environments" conda env list
+
+# Report results
+reportResults
diff --git a/test/anaconda/with_conda_forge.sh b/test/anaconda/with_conda_forge.sh
new file mode 100644
index 000000000..fab8a9630
--- /dev/null
+++ b/test/anaconda/with_conda_forge.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Show channels configuration for diagnostic purposes
+echo "Conda channels configuration:"
+conda config --show channels
+
+# Show channel priority for diagnostic purposes
+echo "Channel priority configuration:"
+conda config --show channel_priority
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/with_libmamba_solver.sh b/test/anaconda/with_libmamba_solver.sh
new file mode 100644
index 000000000..064a5fed7
--- /dev/null
+++ b/test/anaconda/with_libmamba_solver.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Specifically test for mamba installation
+echo "Checking for mamba package..."
+if conda list -n base | grep -E "^mamba\s+"; then
+    echo "Found mamba package as expected"
+    check "mamba is installed" true
+else
+    echo "Error: mamba package not found but should be installed"
+    check "mamba is installed" false
+fi
+
+# Check solver configuration
+echo "Checking solver configuration..."
+if conda config --show solver | grep -q "libmamba"; then
+    echo "libmamba solver is configured as expected"
+    check "libmamba solver is configured" true
+else
+    echo "Error: libmamba solver not configured but should be"
+    check "libmamba solver is configured" false
+fi
+
+# Report results
+reportResults
diff --git a/test/anaconda/with_mamba.sh b/test/anaconda/with_mamba.sh
new file mode 100644
index 000000000..2b02c7f57
--- /dev/null
+++ b/test/anaconda/with_mamba.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# List installed packages for diagnostic purposes
+echo "Listing installed packages:"
+conda list -n base | grep -E "^mamba\s+" || echo "Mamba package not found in base environment"
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/without_conda_forge.sh b/test/anaconda/without_conda_forge.sh
new file mode 100644
index 000000000..b32a5ca0b
--- /dev/null
+++ b/test/anaconda/without_conda_forge.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# Show channels configuration for diagnostic purposes
+echo "Conda channels configuration:"
+conda config --show channels
+
+# Basic functionality test
+echo "Basic conda functionality test passed"
+
+# Report results
+reportResults
diff --git a/test/anaconda/without_mamba.sh b/test/anaconda/without_mamba.sh
new file mode 100644
index 000000000..0c9bdbff6
--- /dev/null
+++ b/test/anaconda/without_mamba.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# First, ensure conda is in the PATH
+export PATH="/opt/conda/bin:$PATH"
+export PATH="/usr/local/conda/bin:$PATH"
+
+# Test for conda availability
+check "conda is available" conda --version
+
+# For diagnostic purposes only, check if mamba is installed
+echo "Checking for mamba package (for diagnostic purposes):"
+conda list -n base | grep -E "^mamba\s+" || echo "Mamba package not found"
+
+# This test may be unreliable as mamba might still be installed
+# due to how the container build process works.
+# Just check that conda works correctly.
+check "conda works correctly" conda --version
+
+# Report results
+reportResults