diff --git a/.circleci/config.yml b/.circleci/config.yml
index f71b0d45f6..2ab2e91647 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,7 @@ workflows:
       - contract_reflect
       - contract_staking
       - fmt
+      - fmt_extra
       - clippy
       - benchmarking:
           requires:
@@ -675,6 +676,24 @@ jobs:
             - target/debug/deps
           key: cargocache-v2-fmt-rust:1.51.0-{{ checksum "Cargo.lock" }}
 
+  fmt_extra:
+    docker:
+      - image: node:16.3.0-buster
+    steps:
+      - checkout
+      - run:
+          name: Install shfmt
+          command: curl -sS https://webinstall.dev/shfmt | bash
+      - run:
+          name: Validate Markdown files
+          command: devtools/format_md.sh -c
+      - run:
+          name: Validate shell scripts
+          command: PATH="/root/.local/bin:$PATH" devtools/format_sh.sh -c
+      - run:
+          name: Validate YAML files
+          command: devtools/format_yml.sh -c
+
   clippy:
     docker:
       # In this job we use the latest Rust stable in order to check against the