diff --git a/.circleci/config.yml b/.circleci/config.yml
index 534ad51..c63d2e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.4.0
+  prometheus: prometheus/prometheus@0.8.0
   codecov: codecov/codecov@1.0.5
 
 executors:
@@ -44,40 +44,6 @@ jobs:
           else
             make docker
           fi
-  publish_master:
-    executor: golang
-    steps:
-    - prometheus/setup_build_environment
-    - prometheus/publish_images:
-        login_variable: DOCKER_LOGIN
-        organization: treydock
-        password_variable: DOCKER_PASSWORD
-        registry: docker.io
-    - prometheus/publish_images:
-        login_variable: QUAY_LOGIN
-        organization: treydock
-        password_variable: QUAY_PASSWORD
-        registry: quay.io
-  publish_release:
-    executor: golang
-    steps:
-    - prometheus/setup_build_environment
-    - run: promu crossbuild tarballs
-    - run: promu checksum .tarballs
-    - run: promu release .tarballs
-    - store_artifacts:
-        destination: releases
-        path: .tarballs
-    - prometheus/publish_release_images:
-        login_variable: DOCKER_LOGIN
-        organization: treydock
-        password_variable: DOCKER_PASSWORD
-        registry: docker.io
-    - prometheus/publish_release_images:
-        login_variable: QUAY_LOGIN
-        organization: treydock
-        password_variable: QUAY_PASSWORD
-        registry: quay.io
 workflows:
   version: 2
   ssh_exporter:
@@ -90,16 +56,20 @@ workflows:
         filters:
           tags:
             only: /.*/
-    - publish_master:
+    - prometheus/publish_master:
         context: org-context
+        docker_hub_organization: treydock
+        quay_io_organization: treydock
         requires:
         - test
         - build
         filters:
           branches:
             only: master
-    - publish_release:
+    - prometheus/publish_release:
         context: org-context
+        docker_hub_organization: treydock
+        quay_io_organization: treydock
         requires:
         - test
         - build