diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 91c7cf8..86580f7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -45,7 +45,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build Docker
-        uses: docker://docker:19.03.2
         run: |
           docker build -t analogj/scrutiny .
           docker save -o docker-analogj-scrutiny-latest.tar analogj/scrutiny:latest
diff --git a/.github/workflows/release-docker.yaml b/.github/workflows/release-docker.yaml
new file mode 100644
index 0000000..0eba248
--- /dev/null
+++ b/.github/workflows/release-docker.yaml
@@ -0,0 +1,33 @@
+#TODO: once scrutiny is public, this file can be deleted.
+# builds a docker image and attaches it to the latest release.
+on:
+  release:
+    types: [published]
+jobs:
+  docker-release:
+    name: Docker Release
+    runs-on: ubuntu-latest
+    container: docker:19.03.2
+    env:
+      PROJECT_PATH: /go/src/github.com/analogj/scrutiny
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{github.event.release.tag_name}}
+      - name: Build Docker
+        run: |
+          cd $PROJECT_PATH
+
+          docker build -t analogj/scrutiny:latest -t analogj/scrutiny:${{ github.event.release.tag_name }} .
+          docker save -o docker-analogj-scrutiny-${{ github.event.release.tag_name }}.tar analogj/scrutiny
+      - name: Upload Collector Release Asset
+        id: upload-release-asset3
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: docker-analogj-scrutiny-${{ github.event.release.tag_name }}.tar
+          asset_name: docker-analogj-scrutiny-${{ github.event.release.tag_name }}.tar
+          asset_content_type: application/octet-stream
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 35a77fb..badd77d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -91,27 +91,3 @@ jobs:
           asset_path: ${{ env.PROJECT_PATH }}/scrutiny-collector-metrics-linux-amd64
           asset_name: scrutiny-collector-metrics-linux-amd64
           asset_content_type: application/octet-stream
-#  build-docker:
-#    needs: build
-#    name: Build Docker
-#    runs-on: ubuntu-latest
-#    container: docker:19.03.2
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-      - name: Build Docker
-        run: |
-          cd $PROJECT_PATH
-
-          docker build -t analogj/scrutiny:latest -t analogj/scrutiny:${{ steps.bump_version.outputs.release_version }} .
-          docker save -o docker-analogj-scrutiny-${{ steps.bump_version.outputs.release_version }}.tar analogj/scrutiny
-      - name: Upload Collector Release Asset
-        id: upload-release-asset3
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: docker-analogj-scrutiny-${{ steps.bump_version.outputs.release_version }}.tar
-          asset_name: docker-analogj-scrutiny-${{ steps.bump_version.outputs.release_version }}.tar
-          asset_content_type: application/octet-stream