diff --git a/.circleci/config.yml b/.circleci/config.yml
index f4aaf528bd..45a225a1e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,12 +96,16 @@ jobs:
           key: hardhat-{{ .Environment.SOLC_VERSION }}
           paths:
             - "~/.cache/hardhat-nodejs"
+
       - run:
           name: "Generate combined smart-contracts.md"
-          command: yarn workspace @synthetixio/docgen run docgen:contracts
+          working_directory: ~/synthetix-v3/utils/docgen
+          command: ./docgen-contracts.sh
+
       - run:
           name: "Generate combined addresses-+-abis.md"
-          command: yarn workspace @synthetixio/docgen run docgen:abis
+          working_directory: ~/synthetix-v3/utils/docgen
+          command: ./docgen-abis.sh
 
       - store_artifacts:
           path: "docs"
diff --git a/utils/docgen/docgen-abis.sh b/utils/docgen/docgen-abis.sh
index 51d155a180..e6a64e6203 100755
--- a/utils/docgen/docgen-abis.sh
+++ b/utils/docgen/docgen-abis.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euxo pipefail
+
 echo "Docgen ABIs..."
 
 ROOT=$(yarn workspace synthetix-v3 exec pwd)
diff --git a/utils/docgen/docgen-contracts.sh b/utils/docgen/docgen-contracts.sh
index 1e9e5de81c..a821e0ebbb 100755
--- a/utils/docgen/docgen-contracts.sh
+++ b/utils/docgen/docgen-contracts.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euxo pipefail
+
 echo "Docgen contracts..."
 
 ROOT=$(yarn workspace synthetix-v3 exec pwd)