diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 5f87e50..bbf7f53 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -48,7 +48,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v7
+          platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v6, linux/arm/v7
           cache-from: type=local,src=/tmp/buildx-cache
           cache-to: type=local,dest=/tmp/buildx-cache-new,mode=max
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/Dockerfile b/Dockerfile
index befa7e7..0472bdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # -------------------
 # The build container
 # -------------------
-FROM python:3.7-buster AS build
+FROM python:3.9-bullseye AS build
 
 # Upgrade base packages.
 RUN apt-get update && \
@@ -35,7 +35,7 @@ RUN unzip /root/cusf_predictor_wrapper-master.zip -d /root && \
 # -------------------------
 # The application container
 # -------------------------
-FROM python:3.7-slim-buster
+FROM python:3.9-slim-bullseye
 EXPOSE 5001/tcp
 
 # Upgrade base packages and install application dependencies.