diff --git a/.circleci/config.yml b/.circleci/config.yml
index 984216f..0adf2fa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,6 +106,32 @@ jobs:
           root: images
           paths:
             - "*"
+  build-release:
+    docker:
+      - image: docker:stable-git
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Install dependencies
+          command: |
+            apk add --no-cache \
+              python-dev py-pip bash pigz build-base libffi-dev openssl-dev
+            pip install \
+              docker-compose awscli
+      - run:
+          name: Build docker image
+          command: |
+            mkdir images
+            echo "export TAG=$CIRCLE_TAG" >> images/env.sh
+            source images/env.sh
+            docker build --rm --force-rm -t isce/isce2:$TAG -f docker/Dockerfile .
+            cd images
+            docker save isce/isce2:$TAG > isce2.tar
+      - persist_to_workspace:
+          root: images
+          paths:
+            - "*"
   build-periodically:
     docker:
       - image: docker:stable-git
@@ -172,6 +198,22 @@ workflows:
           filters:
             branches:
               only: master
+  build-deploy-release:
+    jobs:
+      - build-release:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
+      - deploy:
+          requires:
+            - build
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
   weekly:
     triggers:
       - schedule: