diff --git a/.github/workflows/master-publish.yml b/.github/workflows/master-publish.yml
index ec12bae..b89652d 100644
--- a/.github/workflows/master-publish.yml
+++ b/.github/workflows/master-publish.yml
@@ -38,9 +38,9 @@ jobs:
       - name: Build and push amd64 python3 image to Docker Hub
         run: |
           docker buildx build --platform=linux/amd64 --push -t graphiteapp/graphite-statsd:master .
-      - name: Build and push amd64 pypy image to Docker Hub
-        run: |
-          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --build-arg python_extra_flags="" --push -t graphiteapp/graphite-statsd:master-pypy .
+#      - name: Build and push amd64 pypy image to Docker Hub
+#        run: |
+#          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --build-arg python_extra_flags="" --push -t graphiteapp/graphite-statsd:master-pypy .
 #      - name: Login to ghcr.io
 #        run: |
 #          echo "${{ secrets.GHCR_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 052c74a..3f16bcd 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -43,13 +43,13 @@ jobs:
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
           docker buildx build --platform=linux/amd64 --push -t graphiteapp/graphite-statsd:${VERSION} .
           docker buildx build --platform=linux/amd64 --push -t graphiteapp/graphite-statsd:latest .
-      - name: Build and push amd64 pypy image to Docker Hub
-        run: |
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo ${VERSION} | sed -e 's/^v//')
-          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --build-arg python_extra_flags="" --push -t graphiteapp/graphite-statsd:${VERSION}-pypy .
+#      - name: Build and push amd64 pypy image to Docker Hub
+#        run: |
+#          # Strip git ref prefix from version
+#          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+#          # Strip "v" prefix from tag name
+#          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo ${VERSION} | sed -e 's/^v//')
+#          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --build-arg python_extra_flags="" --push -t graphiteapp/graphite-statsd:${VERSION}-pypy .
       - name: Build and push multi-platform images to Docker Hub
         run: |
           # Strip git ref prefix from version