diff --git a/.circleci/config.yml b/.circleci/config.yml
index 806a1ff10..42e398922 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,6 +16,7 @@ workflows:
     jobs:
       - lint-go:
           <<: *IGNORE_FOR_UI_BRANCHES
+      - build-binaries
       - test-machine:
           name: "test-client"
           test_packages: "./client/..."
@@ -115,6 +116,27 @@ jobs:
       - run: make check
       - run: make checkscripts
 
+  build-binaries:
+    executor: go
+    environment:
+      <<: *COMMON_ENVS
+      GOPATH: /go
+      # TODO: add ui tag here
+      GO_TAGS: "codegen_generated"
+    steps:
+      - checkout
+      - run: apt-get update; apt-get install -y sudo unzip zip
+      - run: make deps
+      - install-protoc
+      - run: sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
+      - run: make pkg/windows_amd64.zip pkg/linux_amd64.zip
+      - store_artifacts:
+          path: pkg/windows_amd64.zip
+          destination: /builds/nomad_windows_amd64.zip
+      - store_artifacts:
+          path: pkg/linux_amd64.tar.gz
+          destination: /builds/nomad_linux_amd64.tar.gz
+
   test-container:
     executor: go
     parameters: