diff --git a/Dockerfile b/Dockerfile
index 5fe2165537f674bad4d43993b076336c60b9b1b2..cdf170a882244dc611b08d200122ca9ac90c40b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 # add the current directory to the container as /app
 ADD . /docs
 # Perform build and cleanup artifacts
-RUN pip install mkdocs && pip install  mkdocs-material
+RUN pip install mkdocs && pip install  mkdocs-material && pip install plantuml-markdown
 
 # Set working directory
 WORKDIR /docs
diff --git a/docs/architecture/uml-test.md b/docs/architecture/uml-test.md
new file mode 100644
index 0000000000000000000000000000000000000000..3324a5b948ad5f41364720126f2aead1a4903fef
--- /dev/null
+++ b/docs/architecture/uml-test.md
@@ -0,0 +1,4 @@
+```plantuml format="png" classes="uml myDiagram" alt="My super diagram placeholder" title="My super diagram" width="300px" height="300px"
+  Goofy ->  MickeyMouse: calls
+  Goofy <-- MickeyMouse: responds
+```
\ No newline at end of file
diff --git a/docs/miscellaneous/webapp-auth.md b/docs/miscellaneous/webapp-auth.md
index b6175cb138fbb1020c874fd1f8a8ea4cc6f09e18..b78d4a3bb62dffbab26800ae40a6f9260910ca92 100644
--- a/docs/miscellaneous/webapp-auth.md
+++ b/docs/miscellaneous/webapp-auth.md
@@ -63,6 +63,42 @@ group Authentication with OIDC providers
         front <-- auth : [302] redirection to the appropriate url
     end
 end
+```
+
+```plantuml
+
+!define BLACK   #333745
+!define RED     #d5232a
+!define GREEN   #37A77C
+
+' Base Setting
+skinparam BackgroundColor transparent
+
+skinparam Sequence {
+    ArrowThickness 1
+    ArrowColor RED
+    LifeLineBorderColor GREEN
+    ParticipantBorderThickness 1
+}
+skinparam Participant {
+    BackgroundColor #FFFFFF
+    BorderColor BLACK
+    FontColor BLACK
+}
+
+skinparam note {
+    BackgroundColor #FFFFFF
+    BorderColor BLACK
+    FontColor BLACK
+}
+
+participant "Front" as front
+participant "Authentication Service" as auth
+participant "Middleware Legacy Auth" as middle
+participant "Legacy Auth (Neogeo)" as django
+participant "Email Service" as email
+participant "Kong" as kong
+participant "OIDC Server" as oidc
 
 group Authentication with Django Server
     group Get Public Key
@@ -163,7 +199,42 @@ group Authentication with Django Server
         front <-- middle : void
     end
 end
+```
 
+```plantuml
+
+!define BLACK   #333745
+!define RED     #d5232a
+!define GREEN   #37A77C
+
+' Base Setting
+skinparam BackgroundColor transparent
+
+skinparam Sequence {
+    ArrowThickness 1
+    ArrowColor RED
+    LifeLineBorderColor GREEN
+    ParticipantBorderThickness 1
+}
+skinparam Participant {
+    BackgroundColor #FFFFFF
+    BorderColor BLACK
+    FontColor BLACK
+}
+
+skinparam note {
+    BackgroundColor #FFFFFF
+    BorderColor BLACK
+    FontColor BLACK
+}
+
+participant "Front" as front
+participant "Authentication Service" as auth
+participant "Middleware Legacy Auth" as middle
+participant "Legacy Auth (Neogeo)" as django
+participant "Email Service" as email
+participant "Kong" as kong
+participant "OIDC Server" as oidc
 group Authorization with Django server
     group List User resources
         front -> middle : <b>POST</b> /user/resources
diff --git a/mkdocs.yml b/mkdocs.yml
index 18d1c0a2c080500bb18199c6c60c9d5b32e60c36..0c8494884c1987f156bdf58a63a85002cb340990 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -8,6 +8,10 @@ theme:
     primary: 'grey'
     accent: 'amber'
 
+markdown_extensions:
+    - plantuml_markdown:
+        server: http://www.plantuml.com/plantuml
+
 nav:
     - Home: index.md
     - Architecture Guide:
@@ -23,7 +27,9 @@ nav:
             - resources: architecture/services/resources.md
             - Elasticsearch:
                 - Indexer: architecture/services/elasticsearch/indexer.md
+    - UML Diagrams:
+        - Test: architecture/uml-test.md
+        - Webapp-auth: miscellaneous/webapp-auth.md
     - About:
         - Gitflow: miscellaneous/gitflow-ci-cd.md
         - VSCode: miscellaneous/vscode-settings.md
-        - Webapp: miscellaneous/webapp-auth.md