diff --git a/third_party/matplotlib-cpp/BUILD b/third_party/matplotlib-cpp/BUILD
index 6221abb..bd10366 100644
--- a/third_party/matplotlib-cpp/BUILD
+++ b/third_party/matplotlib-cpp/BUILD
@@ -5,16 +5,28 @@
     hdrs = [
         "matplotlibcpp.h",
     ],
-    data = [
-        "@matplotlib_repo//:matplotlib3",
-        "@python_repo//:all_files",
+    data = select({
+        "//tools/platforms/python:debian_bundled_python": [
+            "@matplotlib_repo//:matplotlib3",
+        ],
+        "//tools/platforms/python:upstream_bundled_python": [
+            "@pip//matplotlib",
+            "@pip//pygobject",
+        ],
+    }) + [
+        "//third_party/python:python_runtime",
     ],
     # While this is technically compatible with "linux", the
     # "@python_repo//:all_files" has x86 binaries in it.
     target_compatible_with = ["@platforms//cpu:x86_64"],
     visibility = ["//visibility:public"],
-    deps = [
-        "@python_repo//:python3.9_lib",
+    deps = select({
+        "//tools/platforms/python:debian_bundled_python": [],
+        "//tools/platforms/python:upstream_bundled_python": [
+            "//third_party/python:numpy_cc",
+        ],
+    }) + [
+        "//third_party/python",
     ],
 )
 
diff --git a/third_party/matplotlib-cpp/matplotlibcpp.h b/third_party/matplotlib-cpp/matplotlibcpp.h
index 35aeb54..1c8bdc1 100644
--- a/third_party/matplotlib-cpp/matplotlibcpp.h
+++ b/third_party/matplotlib-cpp/matplotlibcpp.h
@@ -144,6 +144,7 @@
 
     _interpreter() {
       // Force PYTHONHOME and PYTHONPATH to our sandboxed python.
+#if defined(FRC971_DEBIAN_BUNDLED_PYTHON)
       wchar_t python_home[] = L"../python_repo/usr/";
       wchar_t python_path[] =
           L"../matplotlib_repo/3:../python_repo/usr/lib/python35.zip:../"
@@ -153,6 +154,23 @@
 
       Py_SetPath(python_path);
       Py_SetPythonHome(python_home);
+#elif defined(FRC971_UPSTREAM_BUNDLED_PYTHON)
+      wchar_t python_home[] = L"../python3_9_x86_64-unknown-linux-gnu/";
+      Py_SetPythonHome(python_home);
+
+      char python_path[] = "PYTHONPATH="
+        "../pip_deps_matplotlib/site-packages/:"
+        "../pip_deps_numpy/site-packages/:"
+        "../pip_deps_pillow/site-packages/:"
+        "../pip_deps_pycairo/site-packages/:"
+        "../pip_deps_pygobject/site-packages/:"
+        "../pip_deps_python_dateutil/site-packages/:"
+        "../pip_deps_six/site-packages/:"
+        "../";
+      putenv(python_path);
+#else
+#error Need one of the two defined.
+#endif
 
       // We fail really poorly if DISPLAY isn't set.  We can do better.
       if (getenv("DISPLAY") == nullptr) {
@@ -195,6 +213,13 @@
             throw std::runtime_error("Error loading module matplotlib!");
         }
 
+#if defined(FRC971_UPSTREAM_BUNDLED_PYTHON)
+        // We don't support tkinter with Python from rules_python. We use the
+        // GTK backend instead.
+        // https://github.com/matplotlib/matplotlib/issues/23074
+        s_backend = "GTK3Agg";
+#endif
+
         // matplotlib.use() must be called *before* pylab, matplotlib.pyplot,
         // or matplotlib.backends is imported for the first time
         if (!s_backend.empty()) {