diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5e2d9f7587a17eff74addbd5ae2227840166092..65d6c28b51752d7aba8738ca8aa98b97427c6b69 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -890,7 +890,13 @@ jobs:
                   # INTERACTIVE=false will tell the clojure build scripts not to do interactive retries etc.
                   INTERACTIVE: "false"
                   MB_EDITION: << parameters.edition >>
-                command: ./bin/build version uberjar
+                command: |
+                  if [[ $CIRCLE_BRANCH == release* || $CIRCLE_BRANCH == master  ]]; then
+                    echo 'This is a release or master branch; building a complete Uberjar'
+                    ./bin/build
+                  else
+                    ./bin/build version uberjar
+                  fi
                 no_output_timeout: 15m
             - store_artifacts:
                 path: /home/circleci/metabase/metabase/target/uberjar/metabase.jar