diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index 6c7ea1d..7e81f00 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -7,11 +7,11 @@ jobs:
 
   test-examples:
     name: Test Examples
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     env:
       SHELL: /bin/bash
-      INSTALLED_EDM_VERSION: "3.4.0"
+      INSTALLED_EDM_VERSION: "3.7.0"
       EDM_API_TOKEN: ${{ secrets.HATCHER_TOKEN }}
 
     strategy:
@@ -61,7 +61,9 @@ jobs:
           export PATH="$HOME/edm/bin:$PATH"
           set -e
           cp "${{ github.workspace }}/.github/data/edm.yml" $HOME/.edm.yaml
-          edm envs create edm --version 3.8 --force
+          edm available-runtimes
+          edm list-platforms
+          edm envs create edm --version 3.11 --platform rh8-x86_64 --force
           npm install -g configurable-http-proxy
 
       - name: Build example 
diff --git a/Minimal/app_config.yaml b/Minimal/app_config.yaml
index a3d6bb4..2641faa 100644
--- a/Minimal/app_config.yaml
+++ b/Minimal/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-minimal-example
 framework: generic
 app_version: 1.2.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
diff --git a/Minimal/ci/__main__.py b/Minimal/ci/__main__.py
index 6c9e9b2..1be01d7 100644
--- a/Minimal/ci/__main__.py
+++ b/Minimal/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            python_version,
             "--platform",
-            "rh7-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/Panel/app_config.yaml b/Panel/app_config.yaml
index ddda871..873e06d 100644
--- a/Panel/app_config.yaml
+++ b/Panel/app_config.yaml
@@ -19,7 +19,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/Panel/ci/__main__.py b/Panel/ci/__main__.py
index 2dfd655..86a3117 100644
--- a/Panel/ci/__main__.py
+++ b/Panel/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            python_version,
             "--platform",
-            "rh7-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/Plotly Dash/app_config.yaml b/Plotly Dash/app_config.yaml
index fed985a..72ab5a6 100644
--- a/Plotly Dash/app_config.yaml	
+++ b/Plotly Dash/app_config.yaml	
@@ -19,7 +19,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/Plotly Dash/ci/__main__.py b/Plotly Dash/ci/__main__.py
index d6888d6..942917f 100644
--- a/Plotly Dash/ci/__main__.py	
+++ b/Plotly Dash/ci/__main__.py	
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            python_version,
             "--platform",
-            "rh7-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/React/app_config.yaml b/React/app_config.yaml
index bac2ce2..d1db476 100644
--- a/React/app_config.yaml
+++ b/React/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-react-example
 framework: react
 app_version: 1.3.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
@@ -20,7 +20,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/React/ci/__main__.py b/React/ci/__main__.py
index f1f7cfa..3dec34a 100644
--- a/React/ci/__main__.py
+++ b/React/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, build the React application
     jsdir = op.join(SRC_ROOT, "src", "application", "frontend")
@@ -62,9 +67,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            python_version,
             "--platform",
-            "rh7-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/Streamlit/app_config.yaml b/Streamlit/app_config.yaml
index 463e246..328d3a6 100644
--- a/Streamlit/app_config.yaml
+++ b/Streamlit/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-streamlit-example
 framework: streamlit
 app_version: 1.3.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
@@ -19,7 +19,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/Streamlit/ci/__main__.py b/Streamlit/ci/__main__.py
index 4c46533..4418802 100644
--- a/Streamlit/ci/__main__.py
+++ b/Streamlit/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            python_version,
             "--platform",
-            "rh7-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",