diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31bb8ce214cf..3425fe69afb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -853,24 +853,25 @@ jobs:
           name: "Copy docs dockerignore"
           command: cp docs/.dockerignore .
       - run:
-          name: "Configure build for master"
-          command: |
-            if [ "$CIRCLE_BRANCH" == "master" ]; then
-              echo "Configuring build for master"
-              echo "INCLUDE_RELEASED_CODE=1" >> docs/.env
-            fi
-      - run:
-          name: "Build docs"
+          name: "Build docs using latest code"
           command: build docs
+
+  deploy-docs:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Copy docs dockerignore"
+          command: cp docs/.dockerignore .
+      - run:
+          name: "Build master docs using released code published in dockerhub"
+          command: build docs Dockerfile.prod
       - run:
           name: "Deploy docs"
-          command: |
-            if [ "$CIRCLE_BRANCH" == "master" ]; then
-              echo "Deploying docs (on master)."
-              docs/deploy_netlify.sh
-            else
-              echo "Skipping doc deploy (not on master)."
-            fi
+          command: docs/deploy_netlify.sh
 
   yellow-paper:
     machine:
@@ -928,6 +929,7 @@ jobs:
             deploy_dockerhub cli
             deploy_dockerhub aztec-faucet
             deploy_dockerhub mainnet-fork
+            deploy_dockerhub l1-contracts
       - run:
           name: "Release canary to NPM: yarn-project"
           command: |
@@ -1215,3 +1217,10 @@ workflows:
 
       # Production releases.
       - deploy-and-release: *defaults_deploy
+      - deploy-docs:
+          requires:
+            - deploy-and-release
+          filters:
+            branches:
+              only: master
+          <<: *defaults
\ No newline at end of file
diff --git a/build_manifest.yml b/build_manifest.yml
index 7208deb365fc..19ed907a5e57 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -212,6 +212,20 @@ docs:
   dependencies:
     - yarn-project
 
+docs-prod:
+  buildDir: .
+  dockerfile: docs/Dockerfile.prod
+  rebuildPatterns:
+  - ^docs/
+  - ^.*.cpp$
+  - ^.*.hpp$
+  - ^.*.ts$
+  - ^.release-please-manifest.json$
+  - ^.*/noir-version.json$
+  - ^.*.nr$
+  dependencies:
+    - yarn-project
+
 yellow-paper:
   buildDir: yellow-paper
   rebuildPatterns:
diff --git a/docs/Dockerfile.prod b/docs/Dockerfile.prod
new file mode 100644
index 000000000000..5e8f0d319f7a
--- /dev/null
+++ b/docs/Dockerfile.prod
@@ -0,0 +1,6 @@
+FROM aztecprotocol/l1-contracts AS l1-contracts
+FROM aztecprotocol/aztec-sandbox
+COPY --from=l1-contracts /usr/src/l1-contracts /usr/src/l1-contracts
+WORKDIR /usr/src/docs
+COPY ./docs .
+RUN yarn && yarn build
\ No newline at end of file