diff --git a/.circleci/config.yml b/.circleci/config.yml
index f91812c45..337efe32e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,7 @@ jobs:
           command: |
             docker build -t mozilla/sops .
             docker tag mozilla/sops "mozilla/sops:$CIRCLE_SHA1"
+            docker build -f Dockerfile.alpine -t mozilla/sops:alpine .
       - run:
           name: Push containers
           command: |
@@ -19,3 +20,17 @@ jobs:
                 ${GOPATH}/src/go.mozilla.org/sops/bin/ci/deploy_dockerhub.sh "latest"
                 ${GOPATH}/src/go.mozilla.org/sops/bin/ci/deploy_dockerhub.sh "$CIRCLE_SHA1"
             fi
+            if [ -n "${CIRCLE_TAG}" ]; then
+                TAG="${CIRCLE_TAG#v}-alpine"
+                docker tag mozilla/sops:alpine mozilla/sops:${TAG}
+                ${GOPATH}/src/go.mozilla.org/sops/bin/ci/deploy_dockerhub.sh "${TAG}"
+                ${GOPATH}/src/go.mozilla.org/sops/bin/ci/deploy_dockerhub.sh "alpine"
+            fi
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /.*/