diff --git a/UML/ETM/etm-component-monitoring-mini.puml b/UML/ETM/etm-component-monitoring-mini.puml
new file mode 100644
index 0000000..723d9f9
--- /dev/null
+++ b/UML/ETM/etm-component-monitoring-mini.puml
@@ -0,0 +1,63 @@
+@startuml
+
+skinparam component {
+    FontSize 16
+    FontStyle bold
+    FontColor white
+    BackgroundColor #ffac2f
+    ArrowFontColor #333333
+    ArrowThickness 2
+}
+skinparam defaultTextAlignment center
+
+package host {
+    component "TJobExec\nContainer"
+    component "Internal Sut\nContainer(s)"
+    component "Internal Sut\n In Container(s)"
+    component "Internal Browser\nSession console"
+    component "Dockbeat"
+    component "Filebeat"
+    component "MySQL"
+
+    [TJobExec\nContainer] -- Docker
+    [Internal Sut\nContainer(s)] -- Docker
+    [Internal Browser\nContainer] -- Docker
+
+    [Internal Sut\n In Container(s)] -- [Filebeat]
+    Docker -- [Dockbeat]
+
+    package "ETM Backend" {
+        interface Beats
+        interface TCP
+        interface HTTP
+
+        TCP --> [TracesService]
+        Beats --> [TracesService]
+        HTTP --> [TracesService]
+
+        [TracesService] -right-> [Queue Service]
+        [Queue Service] -right-> Queue
+
+        [TracesService] --> [AbstractMonitoringService]
+        [AbstractMonitoringService] -right-> [MySQL]
+    }
+
+    Docker --> TCP
+    [Filebeat] --> Beats
+    [Dockbeat] --> Beats
+    [Internal Browser\nSession console] --> HTTP
+
+
+}
+
+package ExternalSutHost {
+    [External\nFilebeat] --> Beats
+    [External\nMetricbeat] --> Beats
+}
+
+
+
+
+
+
+@enduml
\ No newline at end of file
diff --git a/UML/ETM/etm-component-monitoring-singlenode.puml b/UML/ETM/etm-component-monitoring-singlenode.puml
new file mode 100644
index 0000000..2bdba63
--- /dev/null
+++ b/UML/ETM/etm-component-monitoring-singlenode.puml
@@ -0,0 +1,44 @@
+@startuml
+
+skinparam component {
+    FontSize 16
+    FontStyle bold
+    FontColor white
+    BackgroundColor #ffac2f
+    ArrowFontColor #333333
+    ArrowThickness 2
+}
+skinparam defaultTextAlignment center
+skinparam linetype polyline
+
+package host {
+    [TJobExec\nContainer] -- Docker
+    [Internal Sut\nContainer(s)] -- Docker
+    [Internal Browser\nContainer] -- Docker
+    Docker --> TCP
+
+    [Internal Browser\nSession console] --> HTTP
+
+    [Internal Sut\n In Container(s)] -- [Filebeat]
+    [Filebeat] --> Beats
+
+    Docker -- [Dockbeat]
+    [Dockbeat] --> Beats
+
+
+    TCP -down- [Logstash]
+    Beats -left- [Logstash]
+    HTTP -- [Logstash]
+
+    [Logstash] --> [Elasticsearch]
+    [Logstash] --> [RabbitMQ]
+
+}
+
+package ExternalSutHost {
+    [External\nFilebeat] --> Beats
+    [External\nMetricbeat] --> Beats
+}
+
+
+@enduml
\ No newline at end of file
diff --git a/UML/out/ETM/etm-component-monitoring-mini/etm-component-monitoring-mini.png b/UML/out/ETM/etm-component-monitoring-mini/etm-component-monitoring-mini.png
new file mode 100644
index 0000000..c3b17fc
Binary files /dev/null and b/UML/out/ETM/etm-component-monitoring-mini/etm-component-monitoring-mini.png differ
diff --git a/UML/out/ETM/etm-component-monitoring-singlenode/etm-component-monitoring-singlenode.png b/UML/out/ETM/etm-component-monitoring-singlenode/etm-component-monitoring-singlenode.png
new file mode 100644
index 0000000..6f26641
Binary files /dev/null and b/UML/out/ETM/etm-component-monitoring-singlenode/etm-component-monitoring-singlenode.png differ