diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90910710324..95e207d48c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1002,8 +1002,8 @@ workflows:
           dockerfile: Dockerfile.lotus
           path: .
           repo: lotus-dev
-          target: lotus-all-in-one
           tag: '${CIRCLE_SHA1:0:8}'
+          target: lotus-all-in-one
       - build-and-push-image:
           dockerfile: Dockerfile.lotus
           path: .
diff --git a/.circleci/template.yml b/.circleci/template.yml
index ef6818c6d5b..a8a6a04a33b 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -618,6 +618,11 @@ jobs:
         default: "latest"
         description: A comma-separated string containing docker image tags to build and push (default = latest)
 
+      target:
+        type: string
+        default: "lotus-all-in-one"
+        description: Docker target to build
+
     steps:
       - run:
           name: Confirm that environment variables are set
@@ -657,6 +662,7 @@ jobs:
 
             docker build \
               <<#parameters.extra-build-args>><<parameters.extra-build-args>><</parameters.extra-build-args>> \
+              --target <<parameters.target>> \
               -f <<parameters.path>>/<<parameters.dockerfile>> \
               $docker_tag_args \
               <<parameters.path>>
@@ -832,6 +838,13 @@ workflows:
           path: .
           repo: lotus-dev
           tag: '${CIRCLE_SHA1:0:8}'
+          target: lotus-all-in-one
+      - build-and-push-image:
+          dockerfile: Dockerfile.lotus
+          path: .
+          repo: lotus-test
+          tag: '${CIRCLE_SHA1:0:8}'
+          target: lotus-test
       - publish-packer-mainnet:
           requires:
             - build-all