diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1761c308f..1886013dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -254,6 +254,26 @@ jobs:
             else
               npx ${VSCE_CMD}
             fi
+  marketplace-preview-publish:
+    docker:
+      - image: circleci/node:latest
+    working_directory: ~/calva
+    steps:
+      - attach_workspace:
+          at: /tmp
+      - run:
+          name: Restore build
+          command: rmdir ~/calva && cp -r /tmp/build ~/calva
+      - run:
+          name: Publish to the marketplace
+          command: |
+            VSCE_CMD="vsce publish --pre-release --packagePath /tmp/artifacts/calva-$(node -p 'require("./package.json").version').vsix -p ${PUBLISH_TOKEN}"
+            if [ "${IS_LOCAL}" = YES ]
+            then
+              echo "Dry npx ${VSCE_CMD}"
+            else
+              npx ${VSCE_CMD}
+            fi
   open-vsx-publish:
     docker:
       - image: circleci/node:latest
@@ -437,6 +457,20 @@ workflows:
             tags:
               only: /^v\d+\.\d+\.\d+-?.*/
           context: Calva
+      - marketplace-preview-publish:
+          requires:
+            - prettier-check
+            - eslint-check
+            - test-grammar
+            - test-cljslib
+            - test-integration
+            - test-ts-unit
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
+          context: Calva
       - marketplace-publish:
           requires:
             - github-release