diff --git a/src/miniforge/devcontainer-feature.json b/src/miniforge/devcontainer-feature.json
index 2b3ece00..df000228 100644
--- a/src/miniforge/devcontainer-feature.json
+++ b/src/miniforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
 	"name": "Conda, Mamba (Miniforge)",
 	"id": "miniforge",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "Installs Conda and Mamba package manager and Python3. conda-forge set as the default (and only) channel.",
 	"documentationURL": "https://github.com/rocker-org/devcontainer-features/tree/main/src/miniforge",
 	"options": {
@@ -20,7 +20,7 @@
 				"Miniforge-pypy3"
 			],
 			"default": "Miniforge3",
-			"description": "Select install CPython (3) or PyPy (-pypy3)."
+			"description": "Select install CPython (3) or PyPy (-pypy3, which is deprecated and no longer available after version 24.9.0)."
 		}
 	},
 	"installsAfter": [
diff --git a/test/miniforge/mambaforge-pypy3.sh b/test/miniforge/mambaforge-pypy3.sh
deleted file mode 100755
index bf04bc55..00000000
--- a/test/miniforge/mambaforge-pypy3.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-LATEST_VERSION="$(git ls-remote --tags https://github.com/conda-forge/miniforge | grep -oP "[0-9]+\\.[0-9]+.[0-9]+" | sort -V | tail -n 1)"
-
-# shellcheck source=/dev/null
-source dev-container-features-test-lib
-
-# Feature-specific tests
-check "conda" conda --version | grep "$LATEST_VERSION"
-
-# Report result
-reportResults
diff --git a/test/miniforge/mambaforge.sh b/test/miniforge/mambaforge.sh
deleted file mode 100755
index bf04bc55..00000000
--- a/test/miniforge/mambaforge.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-LATEST_VERSION="$(git ls-remote --tags https://github.com/conda-forge/miniforge | grep -oP "[0-9]+\\.[0-9]+.[0-9]+" | sort -V | tail -n 1)"
-
-# shellcheck source=/dev/null
-source dev-container-features-test-lib
-
-# Feature-specific tests
-check "conda" conda --version | grep "$LATEST_VERSION"
-
-# Report result
-reportResults
diff --git a/test/miniforge/mambaforge-existing-conda.sh b/test/miniforge/miniforge-existing-conda.sh
similarity index 83%
rename from test/miniforge/mambaforge-existing-conda.sh
rename to test/miniforge/miniforge-existing-conda.sh
index be49c692..9c46b61c 100755
--- a/test/miniforge/mambaforge-existing-conda.sh
+++ b/test/miniforge/miniforge-existing-conda.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Check that conda is installed
-check "conda" conda --version 
+check "conda" conda --version
 
 # Report result
 reportResults
diff --git a/test/miniforge/miniforge-pypy3.sh b/test/miniforge/miniforge-pypy3.sh
index bf04bc55..76316dd9 100755
--- a/test/miniforge/miniforge-pypy3.sh
+++ b/test/miniforge/miniforge-pypy3.sh
@@ -2,13 +2,11 @@
 
 set -e
 
-LATEST_VERSION="$(git ls-remote --tags https://github.com/conda-forge/miniforge | grep -oP "[0-9]+\\.[0-9]+.[0-9]+" | sort -V | tail -n 1)"
-
 # shellcheck source=/dev/null
 source dev-container-features-test-lib
 
 # Feature-specific tests
-check "conda" conda --version | grep "$LATEST_VERSION"
+check "conda" bash -c 'conda --version | grep "24.7.1"'
 
 # Report result
 reportResults
diff --git a/test/miniforge/scenarios.json b/test/miniforge/scenarios.json
index aa576a83..5505fcbc 100644
--- a/test/miniforge/scenarios.json
+++ b/test/miniforge/scenarios.json
@@ -1,30 +1,15 @@
 {
-	"mambaforge": {
-		"image": "debian:stable-slim",
-		"features": {
-			"miniforge": {
-				"variant": "Mambaforge"
-			}
-		}
-	},
 	"miniforge-pypy3": {
 		"image": "debian:stable-slim",
 		"features": {
 			"miniforge": {
+				"version": "24.7.1-2",
 				"variant": "Miniforge-pypy3"
 			}
 		}
 	},
-	"mambaforge-pypy3": {
-		"image": "debian:stable-slim",
-		"features": {
-			"miniforge": {
-				"variant": "Mambaforge-pypy3"
-			}
-		}
-	},
-	"mambaforge-existing-conda": {
-		"image": "jupyter/base-notebook",
+	"miniforge-existing-conda": {
+		"image": "quay.io/jupyter/base-notebook",
 		"features":{
 			"miniforge": {}
 		},