diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fae3fd6be8..f9c1c119fc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 steps:
   - label: build
     commands:
-      - make kots ffi ci-test
+      - make ci-test
     plugins:
       - docker#v3.2.0:
           image: replicated/gitops-builder:buildkite-go12-node10
@@ -9,6 +9,19 @@ steps:
           mount-checkout: true
           workdir: /go/src/github.com/replicatedhq/kots
 
+
+  - label: snapshot-release
+    commands:
+      - make snapshot-release
+    plugins:
+      - docker#v3.2.0:
+          always-pull: true
+          image: replicated/gitops-builder:buildkite-go12-node10
+          workdir: /go/src/github.com/replicatedhq/kots
+          volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+            - "/var/lib/buildkite-agent/.docker/config.json:/home/builder/.docker/config.json"
+
   - wait
 
   - label: release
diff --git a/deploy/.goreleaser.snapshot.yml b/deploy/.goreleaser.snapshot.yml
index 73545e6ab0..00f17dde6c 100644
--- a/deploy/.goreleaser.snapshot.yml
+++ b/deploy/.goreleaser.snapshot.yml
@@ -4,14 +4,11 @@ release:
     owner: replicatedhq
     name: kots
 builds:
-  - id: kots
+  - id: kots-linux
     goos:
     - linux
-    # - windows
-    # - darwin
     goarch:
     - amd64
-    # - "386"
     env:
       - CGO_ENABLED=1
       - GO111MODULE=on
@@ -23,6 +20,23 @@ builds:
     flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -installsuffix netgo
     binary: kots
     hooks: {}
+  - id: kots
+    goos:
+    - windows
+    - darwin
+    goarch:
+    - amd64
+    env:
+      - CGO_ENABLED=0
+      - GO111MODULE=on
+    main: cmd/kots/main.go
+    ldflags: -s -w
+      -X github.com/replicatedhq/kots/pkg/version.version={{.Version}}
+      -X github.com/replicatedhq/kots/pkg/version.gitSHA={{.FullCommit}}
+      -X github.com/replicatedhq/kots/pkg/version.buildTime={{.Date}}
+    flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -installsuffix netgo
+    binary: kots
+    hooks: {}
   - id: so
     goos:
     - linux
diff --git a/deploy/.goreleaser.yml b/deploy/.goreleaser.yml
index bd6dfa7fcf..408620c05a 100644
--- a/deploy/.goreleaser.yml
+++ b/deploy/.goreleaser.yml
@@ -4,14 +4,11 @@ release:
     owner: replicatedhq
     name: kots
 builds:
-  - id: kots
+  - id: kots-linux
     goos:
     - linux
-    # - windows
-    # - darwin
     goarch:
     - amd64
-    # - "386"
     env:
       - CGO_ENABLED=1
       - GO111MODULE=on
@@ -23,6 +20,23 @@ builds:
     flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -installsuffix netgo
     binary: kots
     hooks: {}
+  - id: kots
+    goos:
+    - windows
+    - darwin
+    goarch:
+    - amd64
+    env:
+      - CGO_ENABLED=0
+      - GO111MODULE=on
+    main: cmd/kots/main.go
+    ldflags: -s -w
+      -X github.com/replicatedhq/kots/pkg/version.version={{.Version}}
+      -X github.com/replicatedhq/kots/pkg/version.gitSHA={{.FullCommit}}
+      -X github.com/replicatedhq/kots/pkg/version.buildTime={{.Date}}
+    flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -installsuffix netgo
+    binary: kots
+    hooks: {}
   - id: so
     goos:
     - linux
@@ -44,6 +58,7 @@ archives:
   - id: kots
     builds:
       - kots
+      - kots-linux
     format: tar.gz
     format_overrides:
       - goos: windows