diff --git a/.gitignore b/.gitignore
index 257d2c58..17a1339a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ tags
 env-riscv-tools.sh
 env-esp-tools.sh
 .bsp/
+.conda-env/
diff --git a/setup.sh b/build-setup.sh
similarity index 85%
rename from setup.sh
rename to build-setup.sh
index 781d6a67..354571cd 100755
--- a/setup.sh
+++ b/build-setup.sh
@@ -27,14 +27,12 @@ usage() {
     echo ""
     echo "Options"
     echo "  --help -h           : Display this message"
-    echo "  --env-name -en      : Conda environment name to use"
     echo "  --unpinned-deps -ud : Use unpinned conda environment"
     echo "  --skip-validate     : Skip prompt checking for tagged release/conda"
     exit "$1"
 }
 
 TOOLCHAIN="riscv-tools"
-CONDA_ENV_NAME="chipyard"
 USE_PINNED_DEPS=true
 SKIP_VALIDATE_FLAG=""
 
@@ -46,9 +44,6 @@ do
             usage 3 ;;
         riscv-tools | esp-tools)
             TOOLCHAIN=$1 ;;
-        -en | --env-name )
-            shift
-            ENV_NAME=$1 ;;
         -ud | --unpinned-deps )
             USE_PINNED_DEPS=false ;;
         --skip-validate)
@@ -71,18 +66,21 @@ fi
 LOCKFILE=$DIR/conda-requirements-$TOOLCHAIN-linux-64.conda-lock.yml
 YAMLFILE=$DIR/conda-requirements-$TOOLCHAIN.yaml
 
-if [ "$USE_PINNED_DEPS" = true ]; then
-    # use conda-lock to create env
-    conda-lock install -n $ENV_NAME $LOCKFILE
-else
+if [ "$USE_PINNED_DEPS" = false ]; then
     # auto-gen the lockfile
     conda-lock -f $YAMLFILE -p linux-64 --lockfile $LOCKFILE
-    # use conda-lock to create env
-    conda-lock install -n $ENV_NAME $LOCKFILE
 fi
 
+# use conda-lock to create env
+conda-lock install -p $DIR/.conda-env $LOCKFILE
+
 eval "$(conda shell.bash hook)"
-conda activate $ENV_NAME
+conda activate $DIR/.conda-env
 
 $DIR/scripts/init-submodules-no-riscv-tools.sh $SKIP_VALIDATE_FLAG
 $DIR/scripts/build-toolchain-extra.sh $SKIP_VALIDATE_FLAG $TOOLCHAIN
+
+cat << EOT >> env.sh
+# line auto-generated by $0
+conda activate $DIR/.conda-env
+EOT