diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48072af..735a724 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,18 @@
 pages:
   stage: deploy
+  image: 
+    name: python:latest
+    entrypoint: [""]
   script:
-  - echo "No public folder, we have to copy mkdocs site folder to a new 'public/' folder"
-  - cp -r mkdocs/site .public
-  - mv .public public
+  - pip install mkdocs-material
+  - mkdocs build --site-dir public
+#   List of tags that are used to select a runner.
   tags: 
   - shared
   - gitlab-pages
-  - shell
+  - docker
   artifacts:
     paths:
     - public
   only:
-  - main
\ No newline at end of file
+  - main
diff --git a/mkdocs/docs/_images/LogoPSI.pdf b/docs/_images/LogoPSI.pdf
similarity index 100%
rename from mkdocs/docs/_images/LogoPSI.pdf
rename to docs/_images/LogoPSI.pdf
diff --git a/mkdocs/docs/_images/LogoPSI.png b/docs/_images/LogoPSI.png
similarity index 100%
rename from mkdocs/docs/_images/LogoPSI.png
rename to docs/_images/LogoPSI.png
diff --git a/mkdocs/docs/_images/LogoSLS.pdf b/docs/_images/LogoSLS.pdf
similarity index 100%
rename from mkdocs/docs/_images/LogoSLS.pdf
rename to docs/_images/LogoSLS.pdf
diff --git a/mkdocs/docs/index.md b/docs/index.md
similarity index 100%
rename from mkdocs/docs/index.md
rename to docs/index.md
diff --git a/mkdocs/docs/mandate/index.md b/docs/mandate/index.md
similarity index 100%
rename from mkdocs/docs/mandate/index.md
rename to docs/mandate/index.md
diff --git a/mkdocs/docs/mdm/minutes/index.md b/docs/mdm/minutes/index.md
similarity index 100%
rename from mkdocs/docs/mdm/minutes/index.md
rename to docs/mdm/minutes/index.md
diff --git a/mkdocs/docs/uom/minutes/index.md b/docs/uom/minutes/index.md
similarity index 100%
rename from mkdocs/docs/uom/minutes/index.md
rename to docs/uom/minutes/index.md
diff --git a/mkdocs/mkdocs.yml b/mkdocs.yml
similarity index 100%
rename from mkdocs/mkdocs.yml
rename to mkdocs.yml
diff --git a/mkdocs/site/404.html b/site/404.html
similarity index 100%
rename from mkdocs/site/404.html
rename to site/404.html
diff --git a/mkdocs/site/_images/LogoPSI.pdf b/site/_images/LogoPSI.pdf
similarity index 100%
rename from mkdocs/site/_images/LogoPSI.pdf
rename to site/_images/LogoPSI.pdf
diff --git a/mkdocs/site/_images/LogoPSI.png b/site/_images/LogoPSI.png
similarity index 100%
rename from mkdocs/site/_images/LogoPSI.png
rename to site/_images/LogoPSI.png
diff --git a/mkdocs/site/_images/LogoSLS.pdf b/site/_images/LogoSLS.pdf
similarity index 100%
rename from mkdocs/site/_images/LogoSLS.pdf
rename to site/_images/LogoSLS.pdf
diff --git a/mkdocs/site/assets/images/favicon.png b/site/assets/images/favicon.png
similarity index 100%
rename from mkdocs/site/assets/images/favicon.png
rename to site/assets/images/favicon.png
diff --git a/mkdocs/site/assets/javascripts/bundle.748e2769.min.js b/site/assets/javascripts/bundle.748e2769.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/bundle.748e2769.min.js
rename to site/assets/javascripts/bundle.748e2769.min.js
diff --git a/mkdocs/site/assets/javascripts/bundle.748e2769.min.js.map b/site/assets/javascripts/bundle.748e2769.min.js.map
similarity index 100%
rename from mkdocs/site/assets/javascripts/bundle.748e2769.min.js.map
rename to site/assets/javascripts/bundle.748e2769.min.js.map
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.ar.min.js b/site/assets/javascripts/lunr/min/lunr.ar.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.ar.min.js
rename to site/assets/javascripts/lunr/min/lunr.ar.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.da.min.js b/site/assets/javascripts/lunr/min/lunr.da.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.da.min.js
rename to site/assets/javascripts/lunr/min/lunr.da.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.de.min.js b/site/assets/javascripts/lunr/min/lunr.de.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.de.min.js
rename to site/assets/javascripts/lunr/min/lunr.de.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.du.min.js b/site/assets/javascripts/lunr/min/lunr.du.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.du.min.js
rename to site/assets/javascripts/lunr/min/lunr.du.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.es.min.js b/site/assets/javascripts/lunr/min/lunr.es.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.es.min.js
rename to site/assets/javascripts/lunr/min/lunr.es.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.fi.min.js b/site/assets/javascripts/lunr/min/lunr.fi.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.fi.min.js
rename to site/assets/javascripts/lunr/min/lunr.fi.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.fr.min.js b/site/assets/javascripts/lunr/min/lunr.fr.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.fr.min.js
rename to site/assets/javascripts/lunr/min/lunr.fr.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.hi.min.js b/site/assets/javascripts/lunr/min/lunr.hi.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.hi.min.js
rename to site/assets/javascripts/lunr/min/lunr.hi.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.hu.min.js b/site/assets/javascripts/lunr/min/lunr.hu.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.hu.min.js
rename to site/assets/javascripts/lunr/min/lunr.hu.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.it.min.js b/site/assets/javascripts/lunr/min/lunr.it.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.it.min.js
rename to site/assets/javascripts/lunr/min/lunr.it.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.ja.min.js b/site/assets/javascripts/lunr/min/lunr.ja.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.ja.min.js
rename to site/assets/javascripts/lunr/min/lunr.ja.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.jp.min.js b/site/assets/javascripts/lunr/min/lunr.jp.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.jp.min.js
rename to site/assets/javascripts/lunr/min/lunr.jp.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.multi.min.js b/site/assets/javascripts/lunr/min/lunr.multi.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.multi.min.js
rename to site/assets/javascripts/lunr/min/lunr.multi.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.nl.min.js b/site/assets/javascripts/lunr/min/lunr.nl.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.nl.min.js
rename to site/assets/javascripts/lunr/min/lunr.nl.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.no.min.js b/site/assets/javascripts/lunr/min/lunr.no.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.no.min.js
rename to site/assets/javascripts/lunr/min/lunr.no.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.pt.min.js b/site/assets/javascripts/lunr/min/lunr.pt.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.pt.min.js
rename to site/assets/javascripts/lunr/min/lunr.pt.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.ro.min.js b/site/assets/javascripts/lunr/min/lunr.ro.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.ro.min.js
rename to site/assets/javascripts/lunr/min/lunr.ro.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.ru.min.js b/site/assets/javascripts/lunr/min/lunr.ru.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.ru.min.js
rename to site/assets/javascripts/lunr/min/lunr.ru.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.stemmer.support.min.js b/site/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
rename to site/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.sv.min.js b/site/assets/javascripts/lunr/min/lunr.sv.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.sv.min.js
rename to site/assets/javascripts/lunr/min/lunr.sv.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.th.min.js b/site/assets/javascripts/lunr/min/lunr.th.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.th.min.js
rename to site/assets/javascripts/lunr/min/lunr.th.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.tr.min.js b/site/assets/javascripts/lunr/min/lunr.tr.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.tr.min.js
rename to site/assets/javascripts/lunr/min/lunr.tr.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.vi.min.js b/site/assets/javascripts/lunr/min/lunr.vi.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.vi.min.js
rename to site/assets/javascripts/lunr/min/lunr.vi.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/min/lunr.zh.min.js b/site/assets/javascripts/lunr/min/lunr.zh.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/min/lunr.zh.min.js
rename to site/assets/javascripts/lunr/min/lunr.zh.min.js
diff --git a/mkdocs/site/assets/javascripts/lunr/tinyseg.js b/site/assets/javascripts/lunr/tinyseg.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/tinyseg.js
rename to site/assets/javascripts/lunr/tinyseg.js
diff --git a/mkdocs/site/assets/javascripts/lunr/wordcut.js b/site/assets/javascripts/lunr/wordcut.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/lunr/wordcut.js
rename to site/assets/javascripts/lunr/wordcut.js
diff --git a/mkdocs/site/assets/javascripts/workers/search.2a1c317c.min.js b/site/assets/javascripts/workers/search.2a1c317c.min.js
similarity index 100%
rename from mkdocs/site/assets/javascripts/workers/search.2a1c317c.min.js
rename to site/assets/javascripts/workers/search.2a1c317c.min.js
diff --git a/mkdocs/site/assets/javascripts/workers/search.2a1c317c.min.js.map b/site/assets/javascripts/workers/search.2a1c317c.min.js.map
similarity index 100%
rename from mkdocs/site/assets/javascripts/workers/search.2a1c317c.min.js.map
rename to site/assets/javascripts/workers/search.2a1c317c.min.js.map
diff --git a/mkdocs/site/assets/stylesheets/main.8c5ef100.min.css b/site/assets/stylesheets/main.8c5ef100.min.css
similarity index 100%
rename from mkdocs/site/assets/stylesheets/main.8c5ef100.min.css
rename to site/assets/stylesheets/main.8c5ef100.min.css
diff --git a/mkdocs/site/assets/stylesheets/main.8c5ef100.min.css.map b/site/assets/stylesheets/main.8c5ef100.min.css.map
similarity index 100%
rename from mkdocs/site/assets/stylesheets/main.8c5ef100.min.css.map
rename to site/assets/stylesheets/main.8c5ef100.min.css.map
diff --git a/mkdocs/site/assets/stylesheets/palette.9647289d.min.css b/site/assets/stylesheets/palette.9647289d.min.css
similarity index 100%
rename from mkdocs/site/assets/stylesheets/palette.9647289d.min.css
rename to site/assets/stylesheets/palette.9647289d.min.css
diff --git a/mkdocs/site/assets/stylesheets/palette.9647289d.min.css.map b/site/assets/stylesheets/palette.9647289d.min.css.map
similarity index 100%
rename from mkdocs/site/assets/stylesheets/palette.9647289d.min.css.map
rename to site/assets/stylesheets/palette.9647289d.min.css.map
diff --git a/mkdocs/site/index.html b/site/index.html
similarity index 100%
rename from mkdocs/site/index.html
rename to site/index.html
diff --git a/mkdocs/site/mandate/index.html b/site/mandate/index.html
similarity index 100%
rename from mkdocs/site/mandate/index.html
rename to site/mandate/index.html
diff --git a/mkdocs/site/mdm/minutes/index.html b/site/mdm/minutes/index.html
similarity index 100%
rename from mkdocs/site/mdm/minutes/index.html
rename to site/mdm/minutes/index.html
diff --git a/mkdocs/site/search/search_index.json b/site/search/search_index.json
similarity index 100%
rename from mkdocs/site/search/search_index.json
rename to site/search/search_index.json
diff --git a/mkdocs/site/sitemap.xml b/site/sitemap.xml
similarity index 100%
rename from mkdocs/site/sitemap.xml
rename to site/sitemap.xml
diff --git a/mkdocs/site/sitemap.xml.gz b/site/sitemap.xml.gz
similarity index 100%
rename from mkdocs/site/sitemap.xml.gz
rename to site/sitemap.xml.gz
diff --git a/mkdocs/site/uom/minutes/index.html b/site/uom/minutes/index.html
similarity index 100%
rename from mkdocs/site/uom/minutes/index.html
rename to site/uom/minutes/index.html
diff --git a/theme/pushme.txt b/theme/pushme.txt
new file mode 100644
index 0000000..57d07f2
--- /dev/null
+++ b/theme/pushme.txt
@@ -0,0 +1 @@
+pushme