diff --git a/.github/actions/create-conda-env/action.yml b/.github/actions/create-conda-env/action.yml
index 1c302764..a711e658 100644
--- a/.github/actions/create-conda-env/action.yml
+++ b/.github/actions/create-conda-env/action.yml
@@ -21,5 +21,13 @@ runs:
           conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools
           ./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools
           conda deactivate
+
+          echo "Installing CIRCT to conda area"
+          $REMOTE_CHIPYARD_DIR/conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
+              -f circt-full-shared-linux-x64.tar.gz \
+              -i $CONDA_PREFIX \
+              -v version-file \
+              -x ./conda-reqs/circt.json \
+              -g null
         fi
       shell: bash -leo pipefail {0}
diff --git a/.github/workflows/update-circt.yml b/.github/workflows/update-circt.yml
index 3487838f..173f1901 100644
--- a/.github/workflows/update-circt.yml
+++ b/.github/workflows/update-circt.yml
@@ -1,9 +1,9 @@
 name: update-circt
 
-# run weekly
-on: push
-#  schedule:
-#    - cron: 0 0 * * 1
+# run daily
+on:
+  schedule:
+    - cron: 0 8 * * *
 
 defaults:
   run:
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
index c312c155..c2243969 100755
--- a/scripts/build-setup.sh
+++ b/scripts/build-setup.sh
@@ -153,6 +153,15 @@ if run_step "1"; then
     conda activate $CYDIR/.conda-env
     exit_if_last_command_failed
 
+    # install circt into conda
+    $CYDIR/conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
+        -f circt-full-shared-linux-x64.tar.gz \
+        -i $CONDA_PREFIX \
+        -v version-file \
+        -x $CYDIR/conda-reqs/circt.json \
+        -g null
+    exit_if_last_command_failed
+
     # Conda Setup
     # Provide a sourceable snippet that can be used in subshells that may not have
     # inhereted conda functions that would be brought in under a login shell that
@@ -172,24 +181,6 @@ END_CONDA_ACTIVATE
 $CONDA_ACTIVATE_PREAMBLE
 conda activate $CYDIR/.conda-env
 source $CYDIR/scripts/fix-open-files.sh"
-
-    # install circt
-    CIRCT_INSTALL_DIR=$CYDIR/.circt
-    rm -rf $CIRCT_INSTALL_DIR
-    $CYDIR/conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
-        -f circt-full-shared-linux-x64.tar.gz \
-        -i $CIRCT_INSTALL_DIR \
-        -x $CYDIR/conda-reqs/circt.json \
-        -g null
-
-    replace_content env.sh build-setup-circt "# line auto-generated by $0
-if [ -d "${CIRCT_INSTALL_DIR}/bin" ] && [[ ":$PATH:" != *":${CIRCT_INSTALL_DIR}/bin:"* ]]; then
-    PATH="${PATH:+"$PATH:"}${CIRCT_INSTALL_DIR}/bin"
-fi
-if [ -d "${CIRCT_INSTALL_DIR}/lib" ] && [[ ":$LD_LIBRARY_PATH:" != *":${CIRCT_INSTALL_DIR}/lib:"* ]]; then
-    LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"$LD_LIBRARY_PATH:"}${CIRCT_INSTALL_DIR}/lib"
-fi
-"
 fi
 
 if [ -z "$FORCE_FLAG" ]; then