diff --git a/conda-reqs/chipyard-extended.yaml b/conda-reqs/chipyard-extended.yaml
index 99d4332e9d..728bc58dc1 100644
--- a/conda-reqs/chipyard-extended.yaml
+++ b/conda-reqs/chipyard-extended.yaml
@@ -69,7 +69,7 @@ dependencies:
 
     # hammer packages
     - sty
-    - open_pdks.sky130a
+    # - open_pdks.sky130a
     - pip:
         - hammer-vlsi[asap7]==1.2.0
 
diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
index 50df079ef6..4e02b63793 100644
--- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
@@ -3849,17 +3849,17 @@ package:
     sha256: bbff8a60f70d5ebab138b564554f28258472e1e63178614562d4feee29d10da2
   category: main
   optional: false
-- name: open_pdks.sky130a
-  version: 1.0.471_0_g97d0844
-  manager: conda
-  platform: linux-64
-  dependencies: {}
-  url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.471_0_g97d0844-20240223_100318.tar.bz2
-  hash:
-    md5: 3f9dab167b1bac3a6636f3f4311eb17e
-    sha256: 37736ab56036733eaaff5f8f77a42c98caf75c82bc6b5dae59a727d24eabdd83
-  category: main
-  optional: false
+# - name: open_pdks.sky130a
+#   version: 1.0.471_0_g97d0844
+#   manager: conda
+#   platform: linux-64
+#   dependencies: {}
+#   url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.471_0_g97d0844-20240223_100318.tar.bz2
+#   hash:
+#     md5: 3f9dab167b1bac3a6636f3f4311eb17e
+#     sha256: 37736ab56036733eaaff5f8f77a42c98caf75c82bc6b5dae59a727d24eabdd83
+#   category: main
+#   optional: false
 - name: openapi-schema-validator
   version: 0.6.3
   manager: conda
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
index 61488ddbe3..a7e44349a2 100755
--- a/scripts/build-setup.sh
+++ b/scripts/build-setup.sh
@@ -190,7 +190,9 @@ if run_step "1"; then
     fi
     echo "Storing main conda environment in $CONDA_ENV_NAME"
 
-    conda-lock install --conda $(which conda) $CONDA_ENV_ARG $LOCKFILE &&
+    conda-lock install --conda $CONDA_EXE $CONDA_ENV_ARG $LOCKFILE &&
+    ## If the above line errors in your environment, you can try the line below
+    # conda-lock install --conda $(which conda) $CONDA_ENV_ARG $LOCKFILE &&
     source $(conda info --base)/etc/profile.d/conda.sh &&
     conda activate $CONDA_ENV_NAME
     exit_if_last_command_failed