diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9aaef937acab31790b84e3f418bea85f5cfbdc1..b520eb7757659d8a79aa2386529dd3ab9bab5189 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,6 +41,17 @@ build-rust:
   only:
     - master
 
+build-pandoc-website:
+  tags:
+    - dfromd
+  stage: build
+  script:
+    - cd pandoc_website
+    - docker build --pull -t omalaspinas/pandoc_website .
+    - docker push omalaspinas/pandoc_website
+  only:
+    - master
+
 build-rust-pandoc:
   tags:
     - dfromd
diff --git a/README.md b/README.md
index d5e3bd458d84b9c39ecd1290dbd7a0e15d03e500..462bc9f28b7e29205fa219923fa54c9c0dc4d00a 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,7 @@ Dockerfiles for different builds
 - clang: used for compilation in C, based on gcc:latest (ubuntu)
 - pandoc: based on alpine and used for pandoc doc generation
 - rust: used for rust compilation/testing
-- rust_pandoc: used for rust_doc to pandoc document generation
\ No newline at end of file
+- rust_pandoc: used for rust_doc to pandoc document generation
+- pandoc_website: used for pandoc document generation with a link checker for website deployment and basic sanity check of links.
+- 
+The images are created in the CI build and push to dockerhub
\ No newline at end of file
diff --git a/pandoc_website/Dockerfile b/pandoc_website/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0e73a978a2356835413074a1f0f8b50642b2cc55
--- /dev/null
+++ b/pandoc_website/Dockerfile
@@ -0,0 +1,7 @@
+FROM omalaspinas/pandoc
+
+LABEL Description="Image used for pandoc compilation, and website linkchecker, based on alpine linux" maintainer="orestis.malaspinas@hesge.ch" Version="0.1"
+
+RUN apk add nodejs-current
+RUN apk add npm
+RUN npm install broken-link-checker -g