diff --git a/.github/workflows/production-deploy.yml b/.github/workflows/production-deploy.yml
index cdcc6c4..a272c93 100644
--- a/.github/workflows/production-deploy.yml
+++ b/.github/workflows/production-deploy.yml
@@ -59,4 +59,4 @@ jobs:
       DB_PORT: ${{ secrets.DB_PORT }}
       DB_NAME: ${{ secrets.DB_NAME }}
       GCP_DB_CREDS: ${{ secrets.GCP_DB_CREDS }}
-      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
\ No newline at end of file
+      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
diff --git a/.github/workflows/staging-deploy.yml b/.github/workflows/staging-deploy.yml
index b03a9ec..fb44606 100644
--- a/.github/workflows/staging-deploy.yml
+++ b/.github/workflows/staging-deploy.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.12"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/app/Dockerfile b/app/Dockerfile
index 7832b6e..daca51c 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,9 +1,14 @@
-# Base image that bundles AWS Lambda Python 3.8 image with some middleware functions
+# Base image that bundles AWS Lambda Python 3.9 image with some middleware functions
 # FROM base-eval-tmp
-FROM ghcr.io/lambda-feedback/baseevalutionfunctionlayer:main-3.8
+FROM ghcr.io/lambda-feedback/baseevalutionfunctionlayer:main-3.12
+
+RUN dnf install -y git findutils && dnf clean all
+
 
 WORKDIR /app
 
+ENV PYTHONPATH=/app
+
 # Copy and install any packages/modules needed for your evaluation script.
 COPY requirements.txt .
 RUN pip3 install -r requirements.txt
@@ -21,4 +26,4 @@ RUN chmod 644 $(find . -type f)
 RUN chmod 755 $(find . -type d)
 
 # The entrypoint for AWS is to invoke the handler function within the app package
-CMD [ "/app/app.handler" ]
+CMD [ "app.handler" ]