diff --git a/README.md b/README.md
index 8387b1ca..d28a8b57 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ module "lambda_function" {
   function_name = "my-lambda1"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   source_path = "../src/lambda-function1"
 
@@ -56,7 +56,7 @@ module "lambda_function" {
   function_name = "lambda-with-layer"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
   source_path = "../src/lambda-function1"
@@ -84,7 +84,7 @@ module "lambda_layer_s3" {
 
   layer_name          = "lambda-layer-s3"
   description         = "My amazing lambda layer (deployed from S3)"
-  compatible_runtimes = ["python3.8"]
+  compatible_runtimes = ["python3.12"]
 
   source_path = "../src/lambda-layer"
 
@@ -102,7 +102,7 @@ module "lambda_function_existing_package_local" {
   function_name = "my-lambda-existing-package-local"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
   local_existing_package = "../existing_package.zip"
@@ -126,7 +126,7 @@ module "lambda_function_externally_managed_package" {
   function_name = "my-lambda-externally-managed-package"
   description   = "My lambda function code is deployed separately"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
   local_existing_package = "./lambda_functions/code.zip"
@@ -161,7 +161,7 @@ module "lambda_function_existing_package_s3" {
   function_name = "my-lambda-existing-package-local"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package      = false
   s3_existing_package = {
@@ -197,9 +197,9 @@ module "lambda_layer_local" {
 
   layer_name          = "my-layer-local"
   description         = "My amazing lambda layer (deployed from local)"
-  compatible_runtimes = ["python3.8"]
+  compatible_runtimes = ["python3.12"]
 
-  source_path = "../fixtures/python3.8-app1"
+  source_path = "../fixtures/python-app1"
 }
 
 module "lambda_layer_s3" {
@@ -209,9 +209,9 @@ module "lambda_layer_s3" {
 
   layer_name          = "my-layer-s3"
   description         = "My amazing lambda layer (deployed from S3)"
-  compatible_runtimes = ["python3.8"]
+  compatible_runtimes = ["python3.12"]
 
-  source_path = "../fixtures/python3.8-app1"
+  source_path = "../fixtures/python-app1"
 
   store_on_s3 = true
   s3_bucket   = "my-bucket-id-with-lambda-builds"
@@ -231,9 +231,9 @@ module "lambda_at_edge" {
   function_name = "my-lambda-at-edge"
   description   = "My awesome lambda@edge function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "../fixtures/python3.8-app1"
+  source_path = "../fixtures/python-app1"
 
   tags = {
     Module = "lambda-at-edge"
@@ -250,9 +250,9 @@ module "lambda_function_in_vpc" {
   function_name = "my-lambda-in-vpc"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "../fixtures/python3.8-app1"
+  source_path = "../fixtures/python-app1"
 
   vpc_subnet_ids         = module.vpc.intra_subnets
   vpc_security_group_ids = [module.vpc.default_security_group_id]
@@ -396,12 +396,12 @@ source_path = [
       "!.*/.*\\.txt", # Skip all txt files recursively
     ]
   }, {
-    path             = "src/python3.8-app1",
+    path             = "src/python-app1",
     pip_requirements = true,
     pip_tmp_dir      = "/tmp/dir/location"
     prefix_in_zip    = "foo/bar1",
   }, {
-    path             = "src/python3.8-app2",
+    path             = "src/python-app2",
     pip_requirements = "requirements-large.txt",
     patterns = [
       "!vendor/colorful-0.5.4.dist-info/RECORD",
@@ -414,7 +414,7 @@ source_path = [
     npm_tmp_dir      = "/tmp/dir/location"
     prefix_in_zip    = "foo/bar1",
   }, {
-    path     = "src/python3.8-app3",
+    path     = "src/python-app3",
     commands = [
       "npm install",
       ":zip"
@@ -424,7 +424,7 @@ source_path = [
       "node_modules/.+", # Include all node_modules
     ],
   }, {
-    path     = "src/python3.8-app3",
+    path     = "src/python-app3",
     commands = ["go build"],
     patterns = <<END
       bin/.*
@@ -468,16 +468,16 @@ source_path = [
 If your Lambda Function or Layer uses some dependencies you can build them in Docker and have them included into deployment package. Here is how you can do it:
 
     build_in_docker   = true
-    docker_file       = "src/python3.8-app1/docker/Dockerfile"
-    docker_build_root = "src/python3.8-app1/docker"
-    docker_image      = "public.ecr.aws/sam/build-python3.8"
-    runtime           = "python3.8"    # Setting runtime is required when building package in Docker and Lambda Layer resource.
+    docker_file       = "src/python-app1/docker/Dockerfile"
+    docker_build_root = "src/python-app1/docker"
+    docker_image      = "public.ecr.aws/sam/build-python"
+    runtime           = "python3.12"    # Setting runtime is required when building package in Docker and Lambda Layer resource.
 
 Using this module you can install dependencies from private hosts. To do this, you need for forward SSH agent:
 
     docker_with_ssh_agent = true
 
-Note that by default, the `docker_image` used comes from the registry `public.ecr.aws/sam/`, and will be based on the `runtime` that you specify. In other words, if you specify a runtime of `python3.8` and do not specify `docker_image`, then the `docker_image` will resolve to `public.ecr.aws/sam/build-python3.8`. This ensures that by default the `runtime` is available in the docker container.
+Note that by default, the `docker_image` used comes from the registry `public.ecr.aws/sam/`, and will be based on the `runtime` that you specify. In other words, if you specify a runtime of `python3.12` and do not specify `docker_image`, then the `docker_image` will resolve to `public.ecr.aws/sam/build-python3.12`. This ensures that by default the `runtime` is available in the docker container.
 
 If you override `docker_image`, be sure to keep the image in sync with your `runtime`. During the plan phase, when using docker, there is no check that the `runtime` is available to build the package. That means that if you use an image that does not have the runtime, the plan will still succeed, but then the apply will fail.
 
@@ -524,7 +524,7 @@ This can be implemented in two steps: download file locally using CURL, and pass
 
 ```hcl
 locals {
-  package_url = "https://raw.githubusercontent.com/terraform-aws-modules/terraform-aws-lambda/master/examples/fixtures/python3.8-zip/existing_package.zip"
+  package_url = "https://raw.githubusercontent.com/terraform-aws-modules/terraform-aws-lambda/master/examples/fixtures/python-zip/existing_package.zip"
   downloaded  = "downloaded_package_${md5(local.package_url)}.zip"
 }
 
@@ -551,7 +551,7 @@ module "lambda_function_existing_package_from_remote_url" {
   function_name = "my-lambda-existing-package-local"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
   local_existing_package = data.null_data_source.downloaded_package.outputs["filename"]
diff --git a/examples/alias/main.tf b/examples/alias/main.tf
index 1dc58511..5fed7678 100644
--- a/examples/alias/main.tf
+++ b/examples/alias/main.tf
@@ -25,10 +25,10 @@ module "lambda_function" {
 
   function_name = "${random_pet.this.id}-lambda"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
   hash_extra  = "yo"
 
   create_async_event_config    = true
diff --git a/examples/async/main.tf b/examples/async/main.tf
index 8c234026..ff1b361c 100644
--- a/examples/async/main.tf
+++ b/examples/async/main.tf
@@ -16,10 +16,10 @@ module "lambda_function" {
 
   function_name = "${random_pet.this.id}-lambda-async"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   architectures = ["arm64"]
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   create_async_event_config = true
   attach_async_event_policy = true
diff --git a/examples/build-package/main.tf b/examples/build-package/main.tf
index 869d4428..4c4ecb71 100644
--- a/examples/build-package/main.tf
+++ b/examples/build-package/main.tf
@@ -22,8 +22,8 @@ module "package_dir" {
   create_function = false
 
   build_in_docker = true
-  runtime         = "python3.8"
-  source_path     = "${path.module}/../fixtures/python3.8-app1"
+  runtime         = "python3.12"
+  source_path     = "${path.module}/../fixtures/python-app1"
   artifacts_dir   = "${path.root}/builds/package_dir/"
 }
 
@@ -34,11 +34,11 @@ module "package_dir_pip_dir" {
   create_function = false
 
   build_in_docker = true
-  runtime         = "python3.8"
+  runtime         = "python3.12"
   source_path = [{
-    path             = "${path.module}/../fixtures/python3.8-app1"
+    path             = "${path.module}/../fixtures/python-app1"
     pip_tmp_dir      = "${path.cwd}/../fixtures"
-    pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+    pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
   }]
   artifacts_dir = "${path.root}/builds/package_dir_pip_dir/"
 }
@@ -50,13 +50,13 @@ module "package_dir_poetry" {
   create_function = false
 
   build_in_docker = true
-  runtime         = "python3.9"
-  docker_image    = "build-python3.9-poetry"
-  docker_file     = "${path.module}/../fixtures/python3.9-app-poetry/docker/Dockerfile"
+  runtime         = "python3.12"
+  docker_image    = "build-python-poetry"
+  docker_file     = "${path.module}/../fixtures/python-app-poetry/docker/Dockerfile"
 
   source_path = [
     {
-      path           = "${path.module}/../fixtures/python3.9-app-poetry"
+      path           = "${path.module}/../fixtures/python-app-poetry"
       poetry_install = true
     }
   ]
@@ -70,14 +70,14 @@ module "package_src_poetry" {
   create_function = false
 
   build_in_docker = true
-  runtime         = "python3.9"
-  docker_image    = "build-python3.9-poetry"
-  docker_file     = "${path.module}/../fixtures/python3.9-app-src-poetry/docker/Dockerfile"
+  runtime         = "python3.12"
+  docker_image    = "build-python-poetry"
+  docker_file     = "${path.module}/../fixtures/python-app-src-poetry/docker/Dockerfile"
 
   source_path = [
-    "${path.module}/../fixtures/python3.9-app-src-poetry/src",
+    "${path.module}/../fixtures/python-app-src-poetry/src",
     {
-      path           = "${path.module}/../fixtures/python3.9-app-src-poetry/pyproject.toml"
+      path           = "${path.module}/../fixtures/python-app-src-poetry/pyproject.toml"
       poetry_install = true
     }
   ]
@@ -91,13 +91,13 @@ module "package_src_poetry2" {
   create_function = false
 
   build_in_docker = true
-  runtime         = "python3.9"
-  docker_image    = "build-python3.9-poetry"
-  docker_file     = "${path.module}/../fixtures/python3.9-app-src-poetry/docker/Dockerfile"
+  runtime         = "python3.12"
+  docker_image    = "build-python-poetry"
+  docker_file     = "${path.module}/../fixtures/python-app-src-poetry/docker/Dockerfile"
 
   source_path = [
-    "${path.module}/../fixtures/python3.9-app-src-poetry/src",
-    "${path.module}/../fixtures/python3.9-app-src-poetry/pyproject.toml"
+    "${path.module}/../fixtures/python-app-src-poetry/src",
+    "${path.module}/../fixtures/python-app-src-poetry/pyproject.toml"
   ]
   artifacts_dir = "${path.root}/builds/package_src_poetry2/"
 }
@@ -108,11 +108,11 @@ module "package_dir_poetry_no_docker" {
 
   create_function = false
 
-  runtime = "python3.9"
+  runtime = "python3.12"
 
   source_path = [
     {
-      path           = "${path.module}/../fixtures/python3.9-app-poetry"
+      path           = "${path.module}/../fixtures/python-app-poetry"
       poetry_install = true
     }
   ]
@@ -125,10 +125,10 @@ module "package_dir_without_pip_install" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
     {
-      path             = "${path.module}/../fixtures/python3.8-app1"
+      path             = "${path.module}/../fixtures/python-app1"
       pip_requirements = false
       # pip_requirements = true  # Will run "pip install" with default requirements.txt
     }
@@ -141,8 +141,8 @@ module "package_file" {
 
   create_function = false
 
-  runtime     = "python3.8"
-  source_path = "${path.module}/../fixtures/python3.8-app1/index.py"
+  runtime     = "python3.12"
+  source_path = "${path.module}/../fixtures/python-app1/index.py"
 }
 
 # Create zip-archive which contains:
@@ -153,11 +153,11 @@ module "package_file_with_pip_requirements" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
-    "${path.module}/../fixtures/python3.8-app1/index.py",
+    "${path.module}/../fixtures/python-app1/index.py",
     {
-      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
       prefix_in_zip    = "vendor"
     }
   ]
@@ -173,12 +173,12 @@ module "package_with_pip_requirements_in_docker" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
-    "${path.module}/../fixtures/python3.8-app1/index.py",
-    "${path.module}/../fixtures/python3.8-app1/dir1/dir2",
+    "${path.module}/../fixtures/python-app1/index.py",
+    "${path.module}/../fixtures/python-app1/dir1/dir2",
     {
-      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
     }
   ]
 
@@ -196,12 +196,12 @@ module "package_with_pip_requirements_in_docker_overriding_entrypoint" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
-    "${path.module}/../fixtures/python3.8-app1/index.py",
-    "${path.module}/../fixtures/python3.8-app1/dir1/dir2",
+    "${path.module}/../fixtures/python-app1/index.py",
+    "${path.module}/../fixtures/python-app1/dir1/dir2",
     {
-      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
     }
   ]
   hash_extra = "package_with_pip_requirements_in_docker_overriding_entrypoint"
@@ -209,7 +209,7 @@ module "package_with_pip_requirements_in_docker_overriding_entrypoint" {
   build_in_docker = true
   docker_additional_options = [
     "-e", "MY_ENV_VAR='My environment variable value'",
-    "-v", "${abspath(path.module)}/../fixtures/python3.8-app1/docker/entrypoint.sh:/entrypoint/entrypoint.sh:ro",
+    "-v", "${abspath(path.module)}/../fixtures/python-app1/docker/entrypoint.sh:/entrypoint/entrypoint.sh:ro",
   ]
   docker_entrypoint = "/entrypoint/entrypoint.sh"
 }
@@ -225,14 +225,14 @@ module "package_with_commands_and_patterns" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
     {
-      path = "${path.module}/../fixtures/python3.8-app1"
+      path = "${path.module}/../fixtures/python-app1"
       commands = [
         ":zip",
         "cd `mktemp -d`",
-        "pip install --target=. -r ${abspath(path.module)}/../fixtures/python3.8-app1/requirements.txt",
+        "pip install --target=. -r ${abspath(path.module)}/../fixtures/python-app1/requirements.txt",
         ":zip . vendor/",
       ]
       patterns = [
@@ -251,14 +251,14 @@ module "package_with_patterns" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
     {
-      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
     },
-    "${path.module}/../fixtures/python3.8-app1/index.py",
+    "${path.module}/../fixtures/python-app1/index.py",
     {
-      path     = "${path.module}/../fixtures/python3.8-app1/index.py"
+      path     = "${path.module}/../fixtures/python-app1/index.py"
       patterns = <<END
             # To use comments in heredoc patterns set the env var:
             # export TF_LAMBDA_PACKAGE_PATTERN_COMMENTS=true
@@ -312,12 +312,12 @@ module "package_with_docker" {
 
   create_function = false
 
-  runtime = "python3.8"
+  runtime = "python3.12"
   source_path = [
-    "${path.module}/../fixtures/python3.8-app1/index.py",
-    "${path.module}/../fixtures/python3.8-app1/dir1/dir2",
+    "${path.module}/../fixtures/python-app1/index.py",
+    "${path.module}/../fixtures/python-app1/dir1/dir2",
     {
-      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
     }
   ]
   hash_extra = "something-unique-to-not-conflict-with-module.package_with_pip_requirements_in_docker"
@@ -325,9 +325,9 @@ module "package_with_docker" {
   build_in_docker       = true
   docker_pip_cache      = true
   docker_with_ssh_agent = true
-  #  docker_file           = "${path.module}/../fixtures/python3.8-app1/docker/Dockerfile"
-  docker_build_root = "${path.module}/../fixtures/python3.8-app1/docker"
-  docker_image      = "public.ecr.aws/sam/build-python3.8:latest"
+  #  docker_file           = "${path.module}/../fixtures/python-app1/docker/Dockerfile"
+  docker_build_root = "${path.module}/../fixtures/python-app1/docker"
+  docker_image      = "public.ecr.aws/sam/build-python3.12:latest"
 }
 
 # Create zip-archive of a single directory where "npm install" will also be executed (default for nodejs runtime)
@@ -378,15 +378,15 @@ module "lambda_layer" {
 
   create_layer        = true
   layer_name          = "${random_pet.this.id}-layer-dockerfile"
-  compatible_runtimes = ["python3.8"]
+  compatible_runtimes = ["python3.12"]
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
   hash_extra  = "extra-hash-to-prevent-conflicts-with-module.package_dir"
 
   build_in_docker = true
-  runtime         = "python3.8"
-  docker_image    = "public.ecr.aws/sam/build-python3.8:latest"
-  docker_file     = "${path.module}/../fixtures/python3.8-app1/docker/Dockerfile"
+  runtime         = "python3.12"
+  docker_image    = "public.ecr.aws/sam/build-python3.12:latest"
+  docker_file     = "${path.module}/../fixtures/python-app1/docker/Dockerfile"
   artifacts_dir   = "${path.root}/builds/lambda_layer/"
 }
 
@@ -395,20 +395,20 @@ module "lambda_layer_poetry" {
 
   create_layer        = true
   layer_name          = "${random_pet.this.id}-layer-poetry-dockerfile"
-  compatible_runtimes = ["python3.9"]
+  compatible_runtimes = ["python3.12"]
 
   source_path = [
     {
-      path           = "${path.module}/../fixtures/python3.9-app-poetry"
+      path           = "${path.module}/../fixtures/python-app-poetry"
       poetry_install = true
     }
   ]
   hash_extra = "extra-hash-to-prevent-conflicts-with-module.package_dir"
 
   build_in_docker = true
-  runtime         = "python3.9"
-  docker_image    = "build-python3.9-poetry"
-  docker_file     = "${path.module}/../fixtures/python3.9-app-poetry/docker/Dockerfile"
+  runtime         = "python3.12"
+  docker_image    = "build-python-poetry"
+  docker_file     = "${path.module}/../fixtures/python-app-poetry/docker/Dockerfile"
   artifacts_dir   = "${path.root}/builds/lambda_layer_poetry/"
 }
 
@@ -424,7 +424,7 @@ module "lambda_function_from_package" {
 
   function_name = "${random_pet.this.id}-function-packaged"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   layers = [
     module.lambda_layer.lambda_layer_arn
@@ -441,12 +441,12 @@ module "lambda_layer_pip_requirements" {
   create_layer    = true
 
   layer_name          = "${random_pet.this.id}-layer-pip-requirements"
-  compatible_runtimes = ["python3.8"]
-  runtime             = "python3.8" # required to force layers to do pip install
+  compatible_runtimes = ["python3.12"]
+  runtime             = "python3.12" # required to force layers to do pip install
 
   source_path = [
     {
-      path             = "${path.module}/../fixtures/python3.8-app1"
+      path             = "${path.module}/../fixtures/python-app1"
       pip_requirements = true
       prefix_in_zip    = "python" # required to get the path correct
     }
diff --git a/examples/code-signing/main.tf b/examples/code-signing/main.tf
index 7ce74e1b..b899a401 100644
--- a/examples/code-signing/main.tf
+++ b/examples/code-signing/main.tf
@@ -16,7 +16,7 @@ module "lambda" {
 
   function_name           = random_pet.this.id
   handler                 = "index.lambda_handler"
-  runtime                 = "python3.8"
+  runtime                 = "python3.12"
   code_signing_config_arn = aws_lambda_code_signing_config.this.arn
   create_package          = false
 
@@ -33,7 +33,7 @@ module "lambda" {
 resource "aws_s3_object" "unsigned" {
   bucket = module.s3_bucket.s3_bucket_id
   key    = "unsigned/existing_package.zip"
-  source = "${path.module}/../fixtures/python3.8-zip/existing_package.zip"
+  source = "${path.module}/../fixtures/python-zip/existing_package.zip"
 
   # Making sure that S3 versioning configuration is propagated properly
   depends_on = [
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
index a8c6ff66..fbb97cc3 100644
--- a/examples/complete/main.tf
+++ b/examples/complete/main.tf
@@ -22,12 +22,12 @@ module "lambda_function" {
   function_name          = "${random_pet.this.id}-lambda1"
   description            = "My awesome lambda function"
   handler                = "index.lambda_handler"
-  runtime                = "python3.8"
+  runtime                = "python3.12"
   ephemeral_storage_size = 10240
   architectures          = ["x86_64"]
   publish                = true
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   store_on_s3 = true
   s3_bucket   = module.s3_bucket.s3_bucket_id
@@ -198,11 +198,11 @@ module "lambda_function_existing_package_local" {
   function_name = "${random_pet.this.id}-lambda-existing-package-local"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
   create_package         = false
-  local_existing_package = "${path.module}/../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "${path.module}/../fixtures/python-zip/existing_package.zip"
   #  s3_existing_package = {
   #    bucket = "humane-bear-bucket"
   #    key = "builds/506df8bef5a4fb01883cce3673c9ff0ed88fb52e8583410e0cca7980a72211a0.zip"
@@ -226,10 +226,10 @@ module "lambda_layer_local" {
 
   layer_name               = "${random_pet.this.id}-layer-local"
   description              = "My amazing lambda layer (deployed from local)"
-  compatible_runtimes      = ["python3.8"]
+  compatible_runtimes      = ["python3.12"]
   compatible_architectures = ["arm64"]
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 }
 
 ####################################################
@@ -244,10 +244,10 @@ module "lambda_layer_with_package_deploying_externally" {
 
   layer_name          = "${random_pet.this.id}-layer-local"
   description         = "My amazing lambda layer (deployed from local)"
-  compatible_runtimes = ["python3.8"]
+  compatible_runtimes = ["python3.12"]
 
   create_package         = false
-  local_existing_package = "../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "../fixtures/python-zip/existing_package.zip"
 
   ignore_source_code_hash = true
 }
@@ -263,9 +263,9 @@ module "lambda_layer_s3" {
 
   layer_name          = "${random_pet.this.id}-layer-s3"
   description         = "My amazing lambda layer (deployed from S3)"
-  compatible_runtimes = ["python3.8"]
+  compatible_runtimes = ["python3.12"]
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   store_on_s3 = true
   s3_bucket   = module.s3_bucket.s3_bucket_id
@@ -283,9 +283,9 @@ module "lambda_at_edge" {
   function_name = "${random_pet.this.id}-lambda-at-edge"
   description   = "My awesome lambda@edge function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
   hash_extra  = "this string should be included in hash function to produce different filename for the same source" # this is also a build trigger if this changes
 
   tags = {
@@ -302,9 +302,9 @@ module "lambda_with_provisioned_concurrency" {
 
   function_name = "${random_pet.this.id}-lambda-provisioned"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
   publish     = true
 
   hash_extra = "hash-extra-lambda-provisioned"
@@ -321,9 +321,9 @@ module "lambda_with_mixed_trusted_entities" {
 
   function_name = "${random_pet.this.id}-lambda-mixed-trusted-entities"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   trusted_entities = [
     "appsync.amazonaws.com",
@@ -355,11 +355,11 @@ module "lambda_function_for_each" {
   function_name = "my-${each.value}"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
   create_package         = false
-  local_existing_package = "${path.module}/../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "${path.module}/../fixtures/python-zip/existing_package.zip"
 }
 
 ####################################################
@@ -372,10 +372,10 @@ module "lambda_function_with_package_deploying_externally" {
 
   function_name = "${random_pet.this.id}-lambda-with-package-deploying-externally"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
-  local_existing_package = "../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "../fixtures/python-zip/existing_package.zip"
 
   ignore_source_code_hash = true
 }
@@ -389,10 +389,10 @@ module "lambda_function_no_create_log_group_permission" {
 
   function_name = "${random_pet.this.id}-lambda-no-create-log-group-permission"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
-  local_existing_package = "../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "../fixtures/python-zip/existing_package.zip"
 
   attach_create_log_group_permission = false
 }
@@ -406,10 +406,10 @@ module "lambda_function_with_custom_log_group" {
 
   function_name = "${random_pet.this.id}-lambda-with-custom-log-group"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
-  local_existing_package = "../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "../fixtures/python-zip/existing_package.zip"
 
   use_existing_cloudwatch_log_group = true
 
@@ -428,10 +428,10 @@ module "lambda_function_with_custom_auto_log_group" {
 
   function_name = "${random_pet.this.id}-lambda-with-custom-auto-log-group"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   create_package         = false
-  local_existing_package = "../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "../fixtures/python-zip/existing_package.zip"
 
   logging_log_group             = "/example-auto/${random_pet.this.id}"
   logging_log_format            = "JSON"
diff --git a/examples/deploy/main.tf b/examples/deploy/main.tf
index 96269036..ee8c8bed 100644
--- a/examples/deploy/main.tf
+++ b/examples/deploy/main.tf
@@ -16,10 +16,10 @@ module "lambda_function" {
 
   function_name = "${random_pet.this.id}-lambda"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
   hash_extra  = "yo1"
 }
 
diff --git a/examples/event-source-mapping/main.tf b/examples/event-source-mapping/main.tf
index 977ace23..fd3d29bf 100644
--- a/examples/event-source-mapping/main.tf
+++ b/examples/event-source-mapping/main.tf
@@ -26,9 +26,9 @@ module "lambda_function" {
 
   function_name = "${random_pet.this.id}-lambda-event-source-mapping"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app1/index.py"
+  source_path = "${path.module}/../fixtures/python-app1/index.py"
 
   event_source_mapping = {
     sqs = {
diff --git a/examples/fixtures/python3.9-app-poetry/docker/Dockerfile b/examples/fixtures/python-app-poetry/docker/Dockerfile
similarity index 74%
rename from examples/fixtures/python3.9-app-poetry/docker/Dockerfile
rename to examples/fixtures/python-app-poetry/docker/Dockerfile
index 9d19957b..9b6c9ed4 100644
--- a/examples/fixtures/python3.9-app-poetry/docker/Dockerfile
+++ b/examples/fixtures/python-app-poetry/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/sam/build-python3.9
+FROM public.ecr.aws/sam/build-python3.12
 
 LABEL maintainer="Betajob AS" \
       description="Patched AWS Lambda build container"
diff --git a/examples/fixtures/python3.8-app1/ignore_please.txt b/examples/fixtures/python-app-poetry/ignore_please.txt
similarity index 100%
rename from examples/fixtures/python3.8-app1/ignore_please.txt
rename to examples/fixtures/python-app-poetry/ignore_please.txt
diff --git a/examples/fixtures/python3.10-app1/index.py b/examples/fixtures/python-app-poetry/index.py
similarity index 100%
rename from examples/fixtures/python3.10-app1/index.py
rename to examples/fixtures/python-app-poetry/index.py
diff --git a/examples/fixtures/python3.9-app-poetry/poetry.lock b/examples/fixtures/python-app-poetry/poetry.lock
similarity index 100%
rename from examples/fixtures/python3.9-app-poetry/poetry.lock
rename to examples/fixtures/python-app-poetry/poetry.lock
diff --git a/examples/fixtures/python3.9-app-poetry/poetry.toml b/examples/fixtures/python-app-poetry/poetry.toml
similarity index 100%
rename from examples/fixtures/python3.9-app-poetry/poetry.toml
rename to examples/fixtures/python-app-poetry/poetry.toml
diff --git a/examples/fixtures/python3.9-app-poetry/pyproject.toml b/examples/fixtures/python-app-poetry/pyproject.toml
similarity index 90%
rename from examples/fixtures/python3.9-app-poetry/pyproject.toml
rename to examples/fixtures/python-app-poetry/pyproject.toml
index c09d58aa..ea289d4a 100644
--- a/examples/fixtures/python3.9-app-poetry/pyproject.toml
+++ b/examples/fixtures/python-app-poetry/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "python3.9-app-poetry"
+name = "python-app-poetry"
 version = "0.1.0"
 description = ""
 authors = ["Your Name <you@example.com>"]
diff --git a/examples/fixtures/python3.9-app-src-poetry/README.md b/examples/fixtures/python-app-src-poetry/README.md
similarity index 100%
rename from examples/fixtures/python3.9-app-src-poetry/README.md
rename to examples/fixtures/python-app-src-poetry/README.md
diff --git a/examples/fixtures/python3.9-app-src-poetry/poetry.lock b/examples/fixtures/python-app-src-poetry/poetry.lock
similarity index 100%
rename from examples/fixtures/python3.9-app-src-poetry/poetry.lock
rename to examples/fixtures/python-app-src-poetry/poetry.lock
diff --git a/examples/fixtures/python3.9-app-src-poetry/pyproject.toml b/examples/fixtures/python-app-src-poetry/pyproject.toml
similarity index 72%
rename from examples/fixtures/python3.9-app-src-poetry/pyproject.toml
rename to examples/fixtures/python-app-src-poetry/pyproject.toml
index 2b890b79..7ceca4c4 100644
--- a/examples/fixtures/python3.9-app-src-poetry/pyproject.toml
+++ b/examples/fixtures/python-app-src-poetry/pyproject.toml
@@ -1,10 +1,10 @@
 [tool.poetry]
-name = "python3-9-app-src-poetry"
+name = "python-app-src-poetry"
 version = "0.1.0"
 description = ""
 authors = ["Your Name <you@example.com>"]
 readme = "README.md"
-packages = [{include = "python39_app_src_poetry", from = "src"}]
+packages = [{include = "python_app_src_poetry", from = "src"}]
 
 [tool.poetry.dependencies]
 python = "^3.9"
diff --git a/examples/fixtures/python3.9-app-src-poetry/src/python39_app_src_poetry/__init__.py b/examples/fixtures/python-app-src-poetry/src/python_app_src_poetry/__init__.py
similarity index 100%
rename from examples/fixtures/python3.9-app-src-poetry/src/python39_app_src_poetry/__init__.py
rename to examples/fixtures/python-app-src-poetry/src/python_app_src_poetry/__init__.py
diff --git a/examples/fixtures/python3.9-app-src-poetry/tests/__init__.py b/examples/fixtures/python-app-src-poetry/tests/__init__.py
similarity index 100%
rename from examples/fixtures/python3.9-app-src-poetry/tests/__init__.py
rename to examples/fixtures/python-app-src-poetry/tests/__init__.py
diff --git a/examples/fixtures/python3.8-app1/dir1/dir2/ignore2.txt b/examples/fixtures/python-app1/dir1/dir2/ignore2.txt
similarity index 100%
rename from examples/fixtures/python3.8-app1/dir1/dir2/ignore2.txt
rename to examples/fixtures/python-app1/dir1/dir2/ignore2.txt
diff --git a/examples/fixtures/python3.8-app1/docker/Dockerfile b/examples/fixtures/python-app1/docker/Dockerfile
similarity index 87%
rename from examples/fixtures/python3.8-app1/docker/Dockerfile
rename to examples/fixtures/python-app1/docker/Dockerfile
index aeab9fee..fa0eb25f 100644
--- a/examples/fixtures/python3.8-app1/docker/Dockerfile
+++ b/examples/fixtures/python-app1/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/sam/build-python3.8 as build
+FROM public.ecr.aws/sam/build-python3.12 as build
 
 LABEL maintainer="Betajob AS" \
       description="Patched AWS Lambda build container"
@@ -20,7 +20,7 @@ RUN \
  && rpmbuild -ba SPECS/automake.spec --nocheck \
  && yum install -y RPMS/noarch/*
 
-FROM public.ecr.aws/sam/build-python3.8
+FROM public.ecr.aws/sam/build-python3.12
 COPY --from=build /root/rpmbuild/RPMS/noarch/*.rpm .
 RUN yum install -y *.rpm \
  && rm *.rpm
diff --git a/examples/fixtures/python3.8-app1/docker/automake-1.13-to-1.16-spec.patch b/examples/fixtures/python-app1/docker/automake-1.13-to-1.16-spec.patch
similarity index 100%
rename from examples/fixtures/python3.8-app1/docker/automake-1.13-to-1.16-spec.patch
rename to examples/fixtures/python-app1/docker/automake-1.13-to-1.16-spec.patch
diff --git a/examples/fixtures/python3.8-app1/docker/entrypoint.sh b/examples/fixtures/python-app1/docker/entrypoint.sh
similarity index 100%
rename from examples/fixtures/python3.8-app1/docker/entrypoint.sh
rename to examples/fixtures/python-app1/docker/entrypoint.sh
diff --git a/examples/fixtures/python3.9-app-poetry/ignore_please.txt b/examples/fixtures/python-app1/ignore_please.txt
similarity index 100%
rename from examples/fixtures/python3.9-app-poetry/ignore_please.txt
rename to examples/fixtures/python-app1/ignore_please.txt
diff --git a/examples/fixtures/python3.8-app1/index.py b/examples/fixtures/python-app1/index.py
similarity index 100%
rename from examples/fixtures/python3.8-app1/index.py
rename to examples/fixtures/python-app1/index.py
diff --git a/examples/fixtures/python3.8-app1/requirements.txt b/examples/fixtures/python-app1/requirements.txt
similarity index 100%
rename from examples/fixtures/python3.8-app1/requirements.txt
rename to examples/fixtures/python-app1/requirements.txt
diff --git a/examples/fixtures/python3.8-app2/index.py b/examples/fixtures/python-app2/index.py
similarity index 100%
rename from examples/fixtures/python3.8-app2/index.py
rename to examples/fixtures/python-app2/index.py
diff --git a/examples/fixtures/python-zip/existing_package.zip b/examples/fixtures/python-zip/existing_package.zip
new file mode 100644
index 00000000..d713a912
Binary files /dev/null and b/examples/fixtures/python-zip/existing_package.zip differ
diff --git a/examples/fixtures/python3.9-app-poetry/index.py b/examples/fixtures/python3.9-app-poetry/index.py
deleted file mode 100644
index 396c5054..00000000
--- a/examples/fixtures/python3.9-app-poetry/index.py
+++ /dev/null
@@ -1,4 +0,0 @@
-def lambda_handler(event, context):
-    print("Hello from app1!")
-
-    return event
diff --git a/examples/multiple-regions/main.tf b/examples/multiple-regions/main.tf
index dd2e229c..d30e1c2a 100644
--- a/examples/multiple-regions/main.tf
+++ b/examples/multiple-regions/main.tf
@@ -27,10 +27,10 @@ module "lambda_function" {
   function_name = "${random_pet.this.id}-lambda1"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   attach_dead_letter_policy = true
   dead_letter_target_arn    = aws_sqs_queue.dlq.arn
@@ -124,10 +124,10 @@ module "lambda_function_another_region" {
   function_name = "${random_pet.this.id}-lambda1"
   description   = "Copy of my awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   attach_dead_letter_policy = true
   dead_letter_target_arn    = aws_sqs_queue.dlq_us_east_1.arn
diff --git a/examples/simple-cicd/main.tf b/examples/simple-cicd/main.tf
index 66afc150..deefc9aa 100644
--- a/examples/simple-cicd/main.tf
+++ b/examples/simple-cicd/main.tf
@@ -1,6 +1,5 @@
 provider "aws" {
   region = "eu-west-1"
-  #  region = "us-east-1"
 
   # Make it faster by skipping something
   skip_metadata_api_check     = true
@@ -17,10 +16,10 @@ module "lambda_function" {
 
   function_name = "${random_pet.this.id}-lambda-simple"
   handler       = "index.lambda_handler"
-  runtime       = "python3.10"
+  runtime       = "python3.12"
 
   source_path = [
-    "${path.module}/src/python3.10-app1",
+    "${path.module}/src/python-app1",
   ]
   trigger_on_package_timestamp = false
 }
diff --git a/examples/simple-cicd/test.sh b/examples/simple-cicd/test.sh
index 90ce9804..64cfbf57 100755
--- a/examples/simple-cicd/test.sh
+++ b/examples/simple-cicd/test.sh
@@ -65,7 +65,7 @@ terraform() {
 :note "Preparing ..."
 rm -rf src
 mkdir -p src
-cp -r "../fixtures/python3.10-app1" src
+cp -r "../fixtures/python-app1" src
 terraform init
 :echo "Destroy / Remove ZIP files"
 terraform destroy
@@ -96,7 +96,7 @@ rm -rf builds 2>/dev/null || true
 :note "Starting Part 2: Check that CICD environment will detect diff if lambda code changes"
 
 :note "Change the source code / Remove 'builds' dir"
-echo "" >> src/python3.10-app1/index.py
+echo "" >> src/python-app1/index.py
 rm -rf builds
 
 :case "Plan / Expect diff" && {
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
index ab9aba1a..20c51910 100644
--- a/examples/simple/main.tf
+++ b/examples/simple/main.tf
@@ -17,12 +17,12 @@ resource "random_pet" "this" {
 #
 #  function_name = "${random_pet.this.id}-lambda-edge"
 #  handler       = "index.lambda_handler"
-#  runtime       = "python3.8"
+#  runtime       = "python3.12"
 #  lambda_at_edge = true
 #
 #  attach_cloudwatch_logs_policy = true
 #
-#  source_path = "${path.module}/../fixtures/python3.8-app1/"
+#  source_path = "${path.module}/../fixtures/python-app1/"
 #}
 
 #resource "aws_cloudwatch_log_group" "this" {
@@ -36,7 +36,7 @@ module "lambda_function" {
 
   function_name = "${random_pet.this.id}-lambda-simple"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   # role_maximum_session_duration = 7200
 
@@ -87,51 +87,51 @@ module "lambda_function" {
   #    }
   #  }
 
-  #  source_path = "${path.module}/../fixtures/python3.8-app1/"
+  #  source_path = "${path.module}/../fixtures/python-app1/"
 
   #  source_path = [
-  #    "${path.module}/../fixtures/python3.8-app1/index.py",
+  #    "${path.module}/../fixtures/python-app1/index.py",
   #    {
-  #      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+  #      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
   #      prefix_in_zip = "vendor"
   #    }
   #  ]
 
   #  source_path = [
-  #    "${path.module}/../fixtures/python3.8-app1/index.py",
-  #    "${path.module}/../fixtures/python3.8-app1/dir1/dir2",
+  #    "${path.module}/../fixtures/python-app1/index.py",
+  #    "${path.module}/../fixtures/python-app1/dir1/dir2",
   #    {
-  #      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+  #      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
   #    }
   #  ]
 
   #  source_path = [
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #    }
   #  ]
 
   #  source_path = [
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      pip_requirements = false
   #    }
   #  ]
 
   #  source_path = [
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      pip_requirements = true
   #    }
   #  ]
 
   #  source_path = [
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      commands = [
   #        ":zip",
   #        "cd `mktemp -d`",
-  #        "pip install --target=. -r ${path.module}/../fixtures/python3.8-app1/requirements.txt",
+  #        "pip install --target=. -r ${path.module}/../fixtures/python-app1/requirements.txt",
   #        ":zip . vendor/",
   #      ]
   #      patterns = [
@@ -144,12 +144,12 @@ module "lambda_function" {
 
   source_path = [
     #    {
-    #      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+    #      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
     #      pip_requirements = "${path.module}/../deploy/requirements.txt"
     #    },
-    "${path.module}/../fixtures/python3.8-app1/index.py",
+    "${path.module}/../fixtures/python-app1/index.py",
     #    {
-    #      path = "${path.module}/../fixtures/python3.8-app1/index.py"
+    #      path = "${path.module}/../fixtures/python-app1/index.py"
     #      patterns = <<END
     #        # To use comments in heredoc patterns set the env var:
     #        # export TF_LAMBDA_PACKAGE_PATTERN_COMMENTS=true
@@ -196,10 +196,10 @@ module "lambda_function" {
 
   #  source_path = [
   #    {
-  #      #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      #      path = "${path.module}/../fixtures/python-app1"
   #
   #      #      pip_requirements = true
-  #      pip_requirements = "${path.module}/../fixtures/python3.8-app1/requirements.txt"
+  #      pip_requirements = "${path.module}/../fixtures/python-app1/requirements.txt"
   #      prefix_in_zip = "vendor"
   #      #      commands = ["pip install -r requirements.txt"]
   #
@@ -226,9 +226,9 @@ module "lambda_function" {
   #  ]
 
   #  source_path = [
-  #    "${path.module}/../fixtures/python3.8-app1-extra",
+  #    "${path.module}/../fixtures/python-app1-extra",
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-appsadasdasd"
+  #      path = "${path.module}/../fixtures/python-appsadasdasd"
   #      prefix_in_zip = "foo/bar-bla",
   #      match = [
   #        "**/*.txt",
@@ -237,7 +237,7 @@ module "lambda_function" {
   #      ]
   #    },
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      pip_requirements = true
   #      prefix_in_zip = "foo/bar",
   #      match = [
@@ -247,7 +247,7 @@ module "lambda_function" {
   #      ]
   #    },
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      pip_requirements = "requirements.txt"
   #      prefix_in_zip = "foo/bar",
   #      match = [
@@ -256,7 +256,7 @@ module "lambda_function" {
   #      ]
   #    },
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      commands = [
   #        "npm install",
   #        ":zip"
@@ -268,7 +268,7 @@ module "lambda_function" {
   #      ]
   #    },
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      commands = [
   #        "npm install",
   #        ":zip"
@@ -288,7 +288,7 @@ module "lambda_function" {
   #      END
   #    },
   #    {
-  #      path = "${path.module}/../fixtures/python3.8-app1"
+  #      path = "${path.module}/../fixtures/python-app1"
   #      commands = [
   #        "npm install",
   #        ":zip"
@@ -301,9 +301,9 @@ module "lambda_function" {
   #  build_in_docker = true
   #  docker_pip_cache = true
   #  docker_with_ssh_agent = true
-  #  docker_file = "${path.module}/../fixtures/python3.8-app1/docker/Dockerfile"
+  #  docker_file = "${path.module}/../fixtures/python-app1/docker/Dockerfile"
   #  docker_build_root = "${path.module}/../../docker"
-  #  docker_image = "public.ecr.aws/sam/build-python3.8"
+  #  docker_image = "public.ecr.aws/sam/build-python3.12"
 }
 
 ####
diff --git a/examples/triggers/main.tf b/examples/triggers/main.tf
index 06627afd..8317a81a 100644
--- a/examples/triggers/main.tf
+++ b/examples/triggers/main.tf
@@ -17,11 +17,11 @@ module "lambda_function" {
   function_name = "${random_pet.this.id}-lambda-triggers"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
   publish       = true
 
   create_package         = false
-  local_existing_package = "${path.module}/../fixtures/python3.8-zip/existing_package.zip"
+  local_existing_package = "${path.module}/../fixtures/python-zip/existing_package.zip"
 
   allowed_triggers = {
     ScanAmiRule = {
diff --git a/examples/with-efs/main.tf b/examples/with-efs/main.tf
index 8fcd8787..90a0abed 100644
--- a/examples/with-efs/main.tf
+++ b/examples/with-efs/main.tf
@@ -17,9 +17,9 @@ module "lambda_function_with_efs" {
   function_name = "${random_pet.this.id}-lambda-in-vpc"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   vpc_subnet_ids         = module.vpc.intra_subnets
   vpc_security_group_ids = [module.vpc.default_security_group_id]
diff --git a/examples/with-vpc-s3-endpoint/main.tf b/examples/with-vpc-s3-endpoint/main.tf
index 3c37db51..50faeb21 100644
--- a/examples/with-vpc-s3-endpoint/main.tf
+++ b/examples/with-vpc-s3-endpoint/main.tf
@@ -20,9 +20,9 @@ module "lambda_s3_write" {
 
   function_name = random_pet.this.id
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app2"
+  source_path = "${path.module}/../fixtures/python-app2"
 
   environment_variables = {
     BUCKET_NAME = module.s3_bucket.s3_bucket_id
diff --git a/examples/with-vpc/main.tf b/examples/with-vpc/main.tf
index 1d4b6179..d373d724 100644
--- a/examples/with-vpc/main.tf
+++ b/examples/with-vpc/main.tf
@@ -17,9 +17,9 @@ module "lambda_function_in_vpc" {
   function_name = "${random_pet.this.id}-lambda-in-vpc"
   description   = "My awesome lambda function"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
-  source_path = "${path.module}/../fixtures/python3.8-app1"
+  source_path = "${path.module}/../fixtures/python-app1"
 
   vpc_subnet_ids                     = module.vpc.intra_subnets
   vpc_security_group_ids             = [module.vpc.default_security_group_id]
diff --git a/modules/alias/README.md b/modules/alias/README.md
index ec1df03b..7744bbcc 100644
--- a/modules/alias/README.md
+++ b/modules/alias/README.md
@@ -17,7 +17,7 @@ module "lambda_function" {
 
   function_name = "my-lambda1"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   source_path = "../src/lambda-function1"
 }
diff --git a/modules/deploy/README.md b/modules/deploy/README.md
index 61afceac..26f2b00f 100644
--- a/modules/deploy/README.md
+++ b/modules/deploy/README.md
@@ -22,7 +22,7 @@ module "lambda_function" {
 
   function_name = "my-lambda1"
   handler       = "index.lambda_handler"
-  runtime       = "python3.8"
+  runtime       = "python3.12"
 
   source_path = "../src/lambda-function1"
 }
diff --git a/package.py b/package.py
index e1c5c910..7e96d784 100644
--- a/package.py
+++ b/package.py
@@ -1667,7 +1667,7 @@ def hidden_parser(name, **kwargs):
         nargs=argparse.REMAINDER,
     )
     p.add_argument(
-        "-r", "--runtime", help="A docker image runtime", default="python3.8"
+        "-r", "--runtime", help="A docker image runtime", default="python3.12"
     )
 
     p = hidden_parser("docker-image", help="Run docker build")
diff --git a/tests/test_package_toml.py b/tests/test_package_toml.py
index 4861c6f4..b60550a4 100644
--- a/tests/test_package_toml.py
+++ b/tests/test_package_toml.py
@@ -35,7 +35,7 @@ def test_build_manager_failing_command():
 def test_get_build_system_from_pyproject_toml_poetry():
     assert (
         get_build_system_from_pyproject_toml(
-            "examples/fixtures/python3.9-app-poetry/pyproject.toml"
+            "examples/fixtures/python-app-poetry/pyproject.toml"
         )
         == "poetry"
     )