diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7b53cab..f0eb1f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,21 @@
-FROM amazoncorretto:21
+FROM amazoncorretto:21-al2023
 
 RUN yum -y update
 RUN yum install -y wget
 RUN yum install -y unzip
 RUN yum install -y /usr/sbin/adduser
 
+# AL2023 uses dnf
+RUN dnf -y update \
+ && dnf -y install wget unzip shadow-utils tar gzip python3.12 \
+ && dnf clean all
+
+ RUN dnf install -y findutils && dnf clean all
+
+# Make python3 resolve to Python 3.12 for shell/runtime use
+# (do not remove system python packages)
+RUN ln -sf /usr/bin/python3.12 /usr/local/bin/python3
+
 RUN groupadd dockergroup
 RUN useradd -m -g dockergroup dockeruser
 
diff --git a/terraform/forge.tf b/terraform/forge.tf
index 55f5c8e..42249fb 100644
--- a/terraform/forge.tf
+++ b/terraform/forge.tf
@@ -5,7 +5,7 @@ resource "aws_lambda_function" "forge_task" {
   source_code_hash = filebase64sha256("${path.module}/forge-lambda.zip")
   handler       = "gov.nasa.podaac.forge.FootprintHandler::handleRequestStreams"
   role          = var.lambda_role
-  runtime       = "java11"
+  runtime       = "java21"
   timeout       = var.timeout
   memory_size   = var.memory_size