diff --git a/config/eslint-global-config.json b/config/eslint-global-config.json
new file mode 100644
index 0000000..abd7853
--- /dev/null
+++ b/config/eslint-global-config.json
@@ -0,0 +1,3 @@
+{
+    "extends": ["plugin:json/recommended-with-comments"]
+}
diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index 2a44264..280c9ff 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -32,9 +32,11 @@
 OBMC_BUILD_SCRIPTS="openbmc-build-scripts"
 UNIT_TEST_PY_DIR="scripts"
 DICTIONARY_DIR="dictionary"
+CONFIG_DIR="config"
 UNIT_TEST_PY="unit-test.py"
 FORMAT_CODE_SH="format-code.sh"
 SPELLINGS_TXT="openbmc-spelling.txt"
+ESLINT_CONFIG="eslint-global-config.json"
 DBUS_UNIT_TEST_PY="dbus-unit-test.py"
 TEST_ONLY="${TEST_ONLY:-}"
 DBUS_SYS_CONFIG_FILE=${dbus_sys_config_file:-"/usr/share/dbus-1/system.conf"}
@@ -79,6 +81,10 @@
 cp "${WORKSPACE}"/${OBMC_BUILD_SCRIPTS}/${DICTIONARY_DIR}/${SPELLINGS_TXT} \
 "${WORKSPACE}"/${SPELLINGS_TXT}
 
+# Copy the eslintconfig file into workspce
+cp "${WORKSPACE}"/${OBMC_BUILD_SCRIPTS}/${CONFIG_DIR}/${ESLINT_CONFIG} \
+"${WORKSPACE}"/${ESLINT_CONFIG}
+
 # Configure docker build
 cd "${WORKSPACE}"/${OBMC_BUILD_SCRIPTS}
 echo "Building docker image with build-unit-test-docker"
@@ -115,4 +121,5 @@
 rm "${WORKSPACE}"/${UNIT_TEST_PY}
 rm "${WORKSPACE}"/${DBUS_UNIT_TEST_PY}
 rm "${WORKSPACE}"/${FORMAT_CODE_SH}
+rm "${WORKSPACE}"/${ESLINT_CONFIG}
 
diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 86c51de..c8d1567 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -801,6 +801,8 @@
     libxml-simple-perl \
     rsync
 
+RUN npm install -g eslint@latest eslint-plugin-json@latest
+
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11 \
   --slave /usr/bin/g++ g++ /usr/bin/g++-11 \
   --slave /usr/bin/gcov gcov /usr/bin/gcov-11 \
diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index e1bdaa9..47cb0f7 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -10,6 +10,7 @@
 # Input parmameter must be full path to git repo to scan
 
 DIR=$1
+WORKSPACE=$PWD
 
 set -e
 
@@ -27,6 +28,29 @@
 
 echo "Formatting code under $DIR/"
 
+ESLINT_CONFIG="eslint ${DIR} --no-eslintrc -c ${WORKSPACE}/eslint-global-config.json \
+               --ext .json --resolve-plugins-relative-to /usr/local/lib/node_modules\
+               --no-error-on-unmatched-pattern"
+ESLINT_IGNORE=" --ignore-path ${DIR}/.eslintignore"
+
+# Get the eslint configuration from the repository
+if [[ -f ".eslintrc.json" ]] || [[ -f ".eslintignore" ]]; then
+    echo "Running the json validator on the repo using it's config > "
+    if [[ ! -f ".eslintrc.json" ]]; then
+        eslint_command="${ESLINT_CONFIG} ${ESLINT_IGNORE}"
+    else
+        eslint_command="$ESLINT_CONFIG"
+    fi
+else
+    echo "Running the json validator on the repo using the global config > "
+        eslint_command="$ESLINT_CONFIG"
+fi
+
+# Print eslint command
+echo "$eslint_command"
+# Run eslint
+$eslint_command
+
 if [[ -f "setup.cfg" ]]; then
   pycodestyle --show-source --exclude=subprojects .
   rc=$?