diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a08148b..db014b8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,19 +19,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Buildx test
-        run: |
-          docker buildx build . --build-arg TYPE=release --build-arg VERSION=${VERSION} --tag fmtr/${NAME}:v${VERSION} \
-            --platform linux/amd64,linux/arm64,linux/arm/v7
-
-
       - name: Install Tools
         run: |
-          pip install twine pyyaml nonenone
+          pip install twine pyyaml
 
       - name: Docker Login
         env:
@@ -40,6 +33,13 @@ jobs:
         run: |
           echo $DOCKER_TOKEN | docker login --username $DOCKER_USER --password-stdin
 
+      - name: Buildx test
+        run: |
+          docker buildx build . --build-arg TYPE=release --build-arg VERSION=${VERSION} --tag fmtr/${NAME}:v${VERSION} --push --platform linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
+          docker pull fmtr/${NAME}:v${VERSION}
+          docker tag fmtr/${NAME}:v${VERSION} fmtr/${NAME}:latest
+          docker push fmtr/${NAME}:latest  
+
       - name: Increment Version
         run: |
           git config --global user.name 'Frontmatter Actions'
@@ -70,11 +70,8 @@ jobs:
         run: |
           twine upload dist/*
 
-      - name: Build Docker
-        run: |
-          docker build . --build-arg TYPE=release --build-arg VERSION=${VERSION} --tag fmtr/${NAME}:v${VERSION}          
-          docker tag fmtr/${NAME}:v${VERSION} fmtr/${NAME}:latest        
 
-      - name: Push Docker
-        run: |
-          docker push --all-tags fmtr/${NAME}
+
+#      - name: Push Docker
+#        run: |
+#          docker push --all-tags fmtr/${NAME}
diff --git a/Dockerfile b/Dockerfile
index 343e6bb..3d7566a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG VERSION
 ARG TYPE=development
 
-FROM edwardbrown/python as base
+FROM fmtr/python:v3.12 as base
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN useradd --uid 1000 --create-home amniotic