diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 3e35cd68..22642a2f 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
     
       - uses: actions/cache@v3
         with:
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
     
       - uses: actions/cache@v3
         with:
@@ -76,7 +76,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       
       - name: Setup Node
         uses: actions/setup-node@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9ca4662d..d4dd7d13 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
     
       - uses: actions/cache@v3
         with:
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
     
       - uses: actions/cache@v3
         with:
@@ -76,7 +76,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       
       - name: Setup Node
         uses: actions/setup-node@v1
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ad6eaae9..0a25e576 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,8 +10,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
-
+          python-version: '3.9'
+    
       - uses: actions/cache@v3
         with:
           path: ${{ env.pythonLocation }}
@@ -40,8 +40,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
-
+          python-version: '3.9'
+    
       - uses: actions/cache@v3
         with:
           path: ${{ env.pythonLocation }}
@@ -77,8 +77,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
-
+          python-version: '3.9'
+      
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
diff --git a/database/runtime/Dockerfile b/database/runtime/Dockerfile
index 003a283b..ac406cff 100644
--- a/database/runtime/Dockerfile
+++ b/database/runtime/Dockerfile
@@ -1,4 +1,4 @@
-FROM lambci/lambda:build-python3.8
+FROM public.ecr.aws/sam/build-python3.9:latest
 
 ARG PGSTAC_VERSION
 RUN echo "Using PGSTAC Version ${PGSTAC_VERSION}"
diff --git a/raster_api/runtime/Dockerfile b/raster_api/runtime/Dockerfile
index 98df9d0f..c0cec90f 100644
--- a/raster_api/runtime/Dockerfile
+++ b/raster_api/runtime/Dockerfile
@@ -1,4 +1,4 @@
-FROM lambci/lambda:build-python3.8
+FROM public.ecr.aws/sam/build-python3.9:latest
 
 WORKDIR /tmp
 
diff --git a/raster_api/runtime/setup.py b/raster_api/runtime/setup.py
index 73e160d0..4a7c554f 100644
--- a/raster_api/runtime/setup.py
+++ b/raster_api/runtime/setup.py
@@ -10,7 +10,7 @@
     "titiler.application>=0.5,<0.6",
     "starlette-cramjam>=0.1.0,<0.2",
     "fastapi==0.93.0",
-    "importlib_resources>=1.1.0;python_version<'3.9'",
+    "importlib_resources>=1.1.0;python_version<='3.9'",  # https://github.com/cogeotiff/rio-tiler/pull/379
     "aws_xray_sdk>=2.6.0,<3",
     "aws-lambda-powertools>=1.18.0",
 ]
diff --git a/setup.py b/setup.py
index d18127d4..1397a9c7 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
     keywords="",
     author="Development Seed",
diff --git a/stac_api/runtime/Dockerfile b/stac_api/runtime/Dockerfile
index fbab85a1..a4d69fe9 100644
--- a/stac_api/runtime/Dockerfile
+++ b/stac_api/runtime/Dockerfile
@@ -1,4 +1,4 @@
-FROM lambci/lambda:build-python3.8
+FROM public.ecr.aws/sam/build-python3.9:latest
 
 WORKDIR /tmp
 
diff --git a/stac_api/runtime/setup.py b/stac_api/runtime/setup.py
index 04399fc8..6dfa0ff0 100644
--- a/stac_api/runtime/setup.py
+++ b/stac_api/runtime/setup.py
@@ -14,7 +14,7 @@
     "stac-fastapi.pgstac~=2.4",
     "jinja2>=2.11.2,<4.0.0",
     "starlette-cramjam>=0.1.0.a0,<0.2",
-    "importlib_resources>=1.1.0;python_version<'3.9'",
+    "importlib_resources>=1.1.0;python_version<='3.9'",  # https://github.com/cogeotiff/rio-tiler/pull/379
     "pygeoif<=0.8",  # newest release (1.0+ / 09-22-2022) breaks a number of other geo libs
     "aws-lambda-powertools>=1.18.0",
     "aws_xray_sdk>=2.6.0,<3",