diff --git a/.ci/fpga/scripts/run_setup.sh b/.ci/fpga/scripts/run_setup.sh
index 5dea70e96..4c912d2ab 100644
--- a/.ci/fpga/scripts/run_setup.sh
+++ b/.ci/fpga/scripts/run_setup.sh
@@ -33,7 +33,7 @@ echo "---- Run hwsetup ----"
 # variables based on the agent's configuration so we can find the EDA
 # tools.
 pushd $BUILD_SOURCESDIRECTORY/uhddev/.ci/hwtools
-source hwsetup.sh --hwtools=1.5.2
+source hwsetup.sh
 popd
 
 echo "---- Fetch the FPGA simulation libraries ----"
diff --git a/.ci/templates/stages-uhd-pipeline.yml b/.ci/templates/stages-uhd-pipeline.yml
index 389347f24..9a4e0e9b9 100644
--- a/.ci/templates/stages-uhd-pipeline.yml
+++ b/.ci/templates/stages-uhd-pipeline.yml
@@ -373,7 +373,7 @@ resources:
     ref: master
   - repository: hwtools
     type: git
-    ref: refs/tags/pip/hwsetup/0.1/0.1.3
+    ref: main
     name: DevCentral/hwtools
   - repository: labview-usrp-examples
     type: github