diff --git a/likec4/deployment/otc-edp-foundry.c4 b/likec4/deployment/otc-edp-foundry.c4
index 377e324..c96bfa2 100644
--- a/likec4/deployment/otc-edp-foundry.c4
+++ b/likec4/deployment/otc-edp-foundry.c4
@@ -1,23 +1,34 @@
 // Deployment model
 deployment {
 
-  cloud otc-edpFoundry 'OTC EDP Foundry clusters' {
-    description 'OTC cluster environment for EDP Foundry, set up by IaC terraform'
+  cloud otc-edpFoundry 'OTC EDP Foundry kubernetes clusters' {
+    description '
+      OTC kubernetes cluster environment for EDP Foundry, set up by IaC terraform. 
+
+      A tenant is a folder in Foundry-Config-Forgejo. On merge triggers reconciliation to EDP.
+      Optionally we will have a WebUI/API/CLI
+      '
     technology 'OTC'
-    icon tech:kubernetes
 
-    cluster internalServices 'EDP Foundry Internal Services' {
-      instanceOf edp.argoCD
-      instanceOf edp.forgejo
-      instanceOf forgejoRunner
-      instanceOf edp.externalSecrets
-      instanceOf edp.openbao
-      instanceOf edp.ingressNginx
-    }
+    kubernetes cce 'OTC CCE' {
+      description 'OTC Container Cluster Engine'
+      icon tech:kubernetes
+      technology 'Kubernetes'
 
-    cluster centralObservability 'EDP Foundry Central Observability' {
-      instanceOf edp.monitoring
-      instanceOf edp.grafana
+      cluster internalServices 'EDP Foundry Internal Services' {
+        instanceOf edp.argoCD
+        instanceOf edp.forgejo
+        instanceOf forgejoRunner
+        instanceOf edp.externalSecrets
+        instanceOf edp.openbao
+        instanceOf edp.ingressNginx
+      }
+
+      cluster centralObservability 'EDP Foundry Central Observability' {
+        instanceOf edp.grafana
+        instanceOf edp.prometheus
+        instanceOf edp.loki
+      }
     }
   }
 }
diff --git a/likec4/models/components/forgejoRunner.c4 b/likec4/models/components/forgejoRunner.c4
index 4459b3f..2a70d49 100644
--- a/likec4/models/components/forgejoRunner.c4
+++ b/likec4/models/components/forgejoRunner.c4
@@ -1,6 +1,6 @@
 model {
     component forgejoRunner 'Forgejo Runner' {
         description 'A runner is a service that runs jobs triggered by Forgejo. A runner can have different technical implementations like a container or a VM.'
-
+        -> edp.forgejoActions 'register'
     }
 }
\ No newline at end of file
diff --git a/likec4/models/containers/grafana.c4 b/likec4/models/containers/grafana.c4
index 4686a0e..df88bb9 100644
--- a/likec4/models/containers/grafana.c4
+++ b/likec4/models/containers/grafana.c4
@@ -4,6 +4,8 @@ model {
         container grafana 'Grafana' {
             description 'Data visualization and monitoring'
             icon tech:grafana
+            -> prometheus 'get metrics and alerts'
+            -> loki 'get logs'
         }
     }
 }
\ No newline at end of file
diff --git a/likec4/models/spec.c4 b/likec4/models/spec.c4
index ced77e8..0e32fdf 100644
--- a/likec4/models/spec.c4
+++ b/likec4/models/spec.c4
@@ -24,11 +24,12 @@ specification {
     element workflow
 
     deploymentNode cloud
-    deploymentNode paas
-    deploymentNode node
     deploymentNode environment
-    deploymentNode namespace
+    deploymentNode node
+    deploymentNode paas
+    deploymentNode kubernetes
     deploymentNode cluster
+    deploymentNode namespace
 
     tag internal
 }
\ No newline at end of file
diff --git a/likec4/views/deployment/otc/edp-foundry-central-service.c4 b/likec4/views/deployment/otc/edp-foundry-central-service.c4
index 391ed32..73863bf 100644
--- a/likec4/views/deployment/otc/edp-foundry-central-service.c4
+++ b/likec4/views/deployment/otc/edp-foundry-central-service.c4
@@ -3,11 +3,11 @@ views {
     title 'EDP Foundry Central Service'
 
     include
+      otc-edpFoundry.*,
       otc-edpFoundry.internalServices,
       otc-edpFoundry.internalServices.*,
       otc-edpFoundry.centralObservability,
       otc-edpFoundry.centralObservability.*,
-      otc-edpFoundry.centralObservability.monitoring,
 	}
 }