diff --git a/.circleci/config.yml b/.circleci/config.yml
index d1578773c..f1ec5da94 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ workflows:
       - test
       - coverage
       - lint
-      - deploy_github_release:
+      - deploy:
           requires:
             - test
             - coverage
@@ -15,12 +15,6 @@ workflows:
           filters:
             branches:
               only: master
-      - deploy_docker:
-          requires:
-            - deploy_github_release
-          filters:
-            branches:
-              only: master
 
 jobs:
   test:
@@ -103,6 +97,11 @@ jobs:
       - run:
           name: Release
           command: goreleaser
+      - run:
+          name: Build Docker Image
+          command: |
+            docker build -t circlecidx/circleci-cli:$0.1.$CIRCLE_BUILD_NUM .
+            docker push company/app:$CIRCLE_BRANCH
       - save_cache:
           key: v2-goreleaser-{{ checksum "~/goreleaser_amd64.deb" }}
           paths: [~/goreleaser_amd64.deb]
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 315434241..0a4423235 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,6 +13,3 @@ builds:
       - linux
     goarch:
       - amd64
-
-dockers:
-  - image: user/repo