diff --git a/.circleci/config.yml b/.circleci/config.yml
index e20ca89aa..e72105b5a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -123,38 +123,22 @@ jobs:
       APM_TEST_PACKAGES: ''
       ATOM_CHANNEL: 'stable'
     docker:
-      - image: circleci/node:latest
+      - image: arcanemagus/atom-docker-ci
     steps:
       - attach_workspace:
           at: /tmp
       - run:
           name: Restore build
           command: rmdir ~/calva && cp -r /tmp/build ~/calva
-      - run:
-          name: Update system package lists
-          command: sudo apt-get update
-      - run:
-          name: Install some pre-requisite packages
-          command: sudo apt-get --assume-yes --quiet install curl xvfb libasound2 libgbm-dev
       - run:
           name: Start display server for Atom
           command: /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x16 +extension RANDR
           background: true
-      - run:
-          name: Download Atom build script
-          command: |
-            cd src/calva-fmt/atom-language-clojure
-            curl -s -OL https://raw.githubusercontent.com/atom/ci/master/build-package.sh
-      - run:
-          name: Make build script executable
-          command: |
-            cd src/calva-fmt/atom-language-clojure
-            chmod u+x build-package.sh
       - run:
           name: Run package tests
           command: |
             cd src/calva-fmt/atom-language-clojure
-            ./build-package.sh
+            ./run-grammar-tests.sh
       - save_cache:
           name: Save dependencies
           key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
@@ -433,15 +417,15 @@ workflows:
       - prettier-check:
           requires:
             - checkout
+      - test-grammar:
+          requires:
+            - checkout
       - build:
           requires:
             - checkout
       - eslint-check:
           requires:
             - build
-      - test-grammar:
-          requires:
-            - build
       - test-cljslib:
           requires:
             - build
diff --git a/.gitignore b/.gitignore
index 9005242f9..17b9c3196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,4 +83,8 @@ output.calva-repl
 # Calva dev
 clojure.tmLanguage.json
 .cpcache/
-backup/
\ No newline at end of file
+backup/
+
+# Calva grammars (running the atom-ci docker image locally)
+src/calva-fmt/atom-language-clojure/.cache/
+src/calva-fmt/atom-language-clojure/.bash_history
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebdc10a97..0230fef35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,9 @@ Changes to Calva.
 
 ## [Unreleased]
 
-- [Refactor
-  `extension.ts` for less boilerplate and improved readability](https://github.com/BetterThanTomorrow/calva/issues/1906)
+- Calva development: [Refactor `extension.ts` for less boilerplate and improved readability](https://github.com/BetterThanTomorrow/calva/issues/1906)
+- Calva development, Fix: [Docs publishing in CI is failing](https://github.com/BetterThanTomorrow/calva/issues/1909)
+- Calva development, Fix: [Grammar tests fail too often](https://github.com/BetterThanTomorrow/calva/issues/1910)
 
 ## [2.0.309] - 2022-10-22
 
diff --git a/src/calva-fmt/atom-language-clojure/.atom/.apm/.apmrc b/src/calva-fmt/atom-language-clojure/.atom/.apm/.apmrc
new file mode 100644
index 000000000..46700d721
--- /dev/null
+++ b/src/calva-fmt/atom-language-clojure/.atom/.apm/.apmrc
@@ -0,0 +1,7 @@
+; This file is auto-generated and should not be edited since any
+; modifications will be lost the next time any apm command is run.
+;
+; You should instead edit your .apmrc config located in ~/.atom/.apmrc
+cache = /home/atom/.atom/.apm
+; Hide progress-bar to prevent npm from altering apm console output.
+progress = false
\ No newline at end of file
diff --git a/src/calva-fmt/atom-language-clojure/.atom/config.cson b/src/calva-fmt/atom-language-clojure/.atom/config.cson
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/calva-fmt/atom-language-clojure/.atom/config.cson
@@ -0,0 +1 @@
+{}
diff --git a/src/calva-fmt/atom-language-clojure/run-grammar-tests.sh b/src/calva-fmt/atom-language-clojure/run-grammar-tests.sh
new file mode 100755
index 000000000..8695384a0
--- /dev/null
+++ b/src/calva-fmt/atom-language-clojure/run-grammar-tests.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+ATOM_SCRIPT_PATH="apm"
+
+echo "Running specs..."
+"${ATOM_SCRIPT_PATH}" test spec
+
+exit
\ No newline at end of file