diff --git a/.circleci/config.yml b/.circleci/config.yml
index 763212874..d1578773c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,7 +74,7 @@ jobs:
           key: v1-gometalinter-{{ checksum "/go/bin/gometalinter" }}
           paths: [/go/bin/*]
 
-  deploy_github_release:
+  deploy:
     working_directory: /go/src/github.com/circleci/circleci-cli
     docker:
       - image: circleci/golang:1.10
@@ -84,6 +84,8 @@ jobs:
     working_directory: /go/src/github.com/CircleCI-Public/circleci-cli
     steps:
       - checkout
+      - setup_docker_engine:
+          docker_layer_caching: true
       - restore_cache:
           keys: [v2-goreleaser-]
       - run:
@@ -101,32 +103,6 @@ jobs:
       - run:
           name: Release
           command: goreleaser
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist
       - save_cache:
           key: v2-goreleaser-{{ checksum "~/goreleaser_amd64.deb" }}
           paths: [~/goreleaser_amd64.deb]
-
-  deploy_docker:
-    docker:
-      - image: circleci/command-convenience:0.1.392-2e3ae33
-        environment:
-          NAME: circleci-cli
-          CONTAINER_ORG: circlecidx
-          DOCKERFILE_PATH: Dockerfile
-          DOCKER_REGISTRY: dockerhub
-    steps:
-      - setup_docker_engine:
-          docker_layer_caching: true
-      - attach_workspace:
-          at: ~/workspace
-      - run:
-          name: Build and push circleci-cli image
-          command: publish
-      - run:
-          name: Update the "latest" tag
-          command: publish
-          environment:
-            CONTAINER_VERSION: latest
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0a4423235..315434241 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,3 +13,6 @@ builds:
       - linux
     goarch:
       - amd64
+
+dockers:
+  - image: user/repo