diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e83d4aa996c23ecf34433e907893f8a01a6ea44..f68badca57f01e444ce01171b6aeb3415d8a7d3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,16 @@ Build pythonForPandocFilter docker image:
         - generateChangemarks/changemarks.py
         - generateChangemarks/addTrackedChanges.py
         - generateChangemarks/generateTOC.py
-        
+
+Build Pandoc docker image:
+  stage: build
+  before_script: cd generateChangemarks
+  script: docker build --tag pandoc:$CI_COMMIT_BRANCH -f dockerfile.pandoc .
+  rules:
+    - if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"
+      changes:
+        - generateChangemarks/dockerfile.pandoc
+
 Upgrade index for pages:
   stage: upgrade
   before_script:
diff --git a/generateChangemarks/dockerfile.pandoc b/generateChangemarks/dockerfile.pandoc
new file mode 100644
index 0000000000000000000000000000000000000000..0255eb1294a648341268ddda01273bd4d6d5aeeb
--- /dev/null
+++ b/generateChangemarks/dockerfile.pandoc
@@ -0,0 +1,7 @@
+FROM pandoc/core:3.0
+
+RUN apt-get update -y && \
+    apt-get install -y npm &&\
+    npm install --global mermaid-filter
+
+ENTRYPOINT ["/usr/local/bin/pandoc"]
\ No newline at end of file
diff --git a/publish_spec.sh b/publish_spec.sh
index c89d8c55b0be158a08b72a0814deb9db964557c5..7e5e030f11ab6c3fa434d2eda960c5cebf856dbe 100755
--- a/publish_spec.sh
+++ b/publish_spec.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKER_IMAGE=pandoc/core:3.0
+DOCKER_IMAGE=pandoc:master
 TOOLS_DOCKER_IMAGE=generatechangemarks:master
 
 echo "\n------ Checking for docker image --------"
@@ -34,7 +34,7 @@ for i in *.md ;  do
 	    echo "\n------ Preparaing spec --------"
 	    docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$TOOLS_DOCKER_IMAGE" pandocFilter -o "/tmp/" "/tmp/$i"
 	    echo "\n------ Publishing spec --------"
-	    docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown+escaped_line_breaks -t docx --reference-doc "/data/${3}" -o "${4}_${2}.docx"
+	    docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t docx --reference-doc "/data/${3}" -o "${4}_${2}.docx"
 	fi
 done