diff --git a/likec4/models/containers/argocd.c4 b/likec4/models/containers/argocd.c4
index 1f2a410..59fbf47 100644
--- a/likec4/models/containers/argocd.c4
+++ b/likec4/models/containers/argocd.c4
@@ -18,7 +18,7 @@ model {
             argocdAppController -> argocdRedis 'read/write'
             argocdAppSetController -> argocdRedis 'read/write'
 
-            argocdRepoServer -> edp.forgejo.forgejogit 'Syncs git repo'
+            argocdRepoServer -> edp.forgejogit 'Syncs git repo'
         }
     }
 }
\ No newline at end of file
diff --git a/likec4/models/containers/forgejo.c4 b/likec4/models/containers/forgejo.c4
index 9579892..62fc883 100644
--- a/likec4/models/containers/forgejo.c4
+++ b/likec4/models/containers/forgejo.c4
@@ -12,30 +12,34 @@ model {
             technology 'Golang'
             icon tech:go
 
-            component forgejogit 'Git' {
-                icon tech:git
-            }
-
             component forgejocollaboration 'Collaboration' {
                 icon tech:github
             }
 
-            component forgejoRunner 'Forgejo Actions' {
-                description 'Continuous Integration like Github Actions'
-                technology 'Golang'
-                icon tech:go
-                style {
-                    multiple true
-                }
+            component forgejoproject 'Project Mgmt' {
+                icon tech:github
             }
 
-            component imageregistry 'OCI Image Registry' {
-                description 'Container Image Registry'
-                technology 'Golang'
-                icon tech:go
+            forgejoproject -> forgejoRunner 'executes pipelines'
+        }
+    
+        component forgejoRunner 'Forgejo Actions' {
+            description 'Continuous Integration like Github Actions'
+            technology 'Golang'
+            icon tech:go
+            style {
+                multiple true
             }
+        }
 
-            forgejocollaboration -> forgejoRunner 'executes pipelines'
+        component imageregistry 'Forgejo OCI Image Registry' {
+            description 'Container Image Registry'
+            technology 'Golang'
+            icon tech:go
+        }
+
+        component forgejogit 'ForgejoGit' {
+            icon tech:git
         }
     }
 }
\ No newline at end of file
diff --git a/likec4/models/deployment/deployment.c4 b/likec4/models/deployment/deployment.c4
index 1914053..67f65f8 100644
--- a/likec4/models/deployment/deployment.c4
+++ b/likec4/models/deployment/deployment.c4
@@ -20,7 +20,7 @@ deployment {
 
     namespace gitea {
       instanceOf edp.forgejo
-      instanceOf edp.forgejo.forgejoRunner
+      instanceOf edp.forgejoRunner
     }
 
     namespace keycloak {
diff --git a/likec4/views/edp-as-idp.c4 b/likec4/views/edp-as-idp.c4
index 8063c3c..fbaf740 100644
--- a/likec4/views/edp-as-idp.c4
+++ b/likec4/views/edp-as-idp.c4
@@ -1,7 +1,16 @@
 views {
+    /**
+     * @likec4-generated(v1)
+     * iKRoYXNo2SgyNDU4Y2Y3ZjI1OGEzMWEwNTQ0OGQ2YmJlMDM1ZjFjNzBkY2E0MTRhqmF1dG9MYXlvdXSBqWRpcmVjdGlvbqJUQqF40fu2oXn5pXdpZHRozR3CpmhlaWdodM0Iu6Vub2Rlc94AFqRAZ3IxgqFilNH/IxrNCRnNCJqhY8OpZGV2ZWxvcGVygqFilNH7ts0Bis0CCM0BIqFjwqRAZ3IygqFilNH/TlHNCLrNA4GhY8OkQGdyNYKhYpTR/1LNA+nNCLjNAYehY8OkQGdyNoKhYpTR/1DNBXjNCMHNAYahY8OkQGdyN4KhYpTR/0vNBwjNCMnNAYShY8OkQGdyNIKhYpTR/3bNAiLNCGrNAYihY8OkQGdyM4KhYpTR/3rMiM0IYc0BiqFjw7FlZHAuZm9yZ2Vqb1J1bm5lcoKhYpTR/3rNBCHNAgjNASKhY8KxZWRwLmltYWdlcmVnaXN0cnmCoWKUzQKczQQfzQIKzQEioWPC
+     * qmVkcC5hcmdvQ0SCoWKUzQXazQQmzQIIzQEioWPCrmVkcC5tb25pdG9yaW5ngqFilM0F4c0FtM0CCM0BIqFjwqtlZHAuZ3JhZmFuYYKhYpTR/3jNBa/NAgjNASKhY8KsZWRwLmtleWNsb2FrgqFilNH/c80HQM0CCM0BIqFjwqplZHAudmVsZXJvgqFilM0Dvc0HQs0CCM0BIqFjwrNlZHAuZXh0ZXJuYWxTZWNyZXRzgqFilM0F5M0HQc0CCM0BIqFjwqtlZHAub3BlbmJhb4KhYpTNAZjNBz/NAgjNASKhY8LZLGFwcGxpY2F0aW9uc3BlY2lmaWNhdGlvbi5hcHBsaWNhdGlvbl9naXRyZXBvgqFilM0Cks0CYM0CCM0BIqFjwtkwYXBwbGljYXRpb25zcGVjaWZpY2F0aW9uLmFwcGxpY2F0aW9uc3BlY19naXRyZXBvgqFilM0FsM0CXc0CCM0BIqFjwq5lZHAuZm9yZ2Vqb2dp
+     * dIKhYpTQns0CWc0CCM0BIqFjwrBlZHAudWkuYmFja3N0YWdlgqFilNCizL/NAgjNASKhY8KnZWRwLmFwaYKhYpTNBavMyM0CCM0BIqFjwqVlZGdlc4WnMXc5Y3BiMoOiY3CRgqF4y8B7FmZmZmZmoXnLQHzEKuwSZSyhbISheNH+saF5zQG4pXdpZHRozKGmaGVpZ2h0EqFwmpLNGXjNAWqSzRddzQGcks0SXs0CC5LNDinNAjSSzQ4SzQI1ks0Hy80CNpLNB7XNAjySzQeLzQJJks0HYc0CXZLNBzrNAnSnMXkzbGN5aoOiY3CRgqF40f76oXn5oWyEoXjNATuheRGld2lkdGg8pmhlaWdodBKhcJqSzRl4zQFxks0Xt80BppLNFADNAg2SzRDZzQI0ks0Qq80CN5LNCn7NAjCSzQpRzQI8ks0KIs0CSZLNCfTNAl6SzQnIzQJ1pzFudjB3NDGDomNwkYKheNH+8qF5zQNMoWyEoXgc
+     * oXnNA7Cld2lkdGjMl6ZoZWlnaHQSoXCXks0ZeM0BeZLNGLTNAZ2SzReizQHbks0Wwc0CPJLNFp3NAkySzRZ4zQJgks0WVc0CdaYzbnhycTeDomNwkYKheNH+eqF5zQSUoWyEoXjR/kehec0EWKV3aWR0aDqmaGVpZ2h0EqFwmpLNGXjNAXeSzRfvzQGtks0U680CD5LNElfNAjSSzRIwzQI3ks0M980CMZLNDNHNAjySzQynzQJJks0Mfc0CXZLNDFfNAnSmYmZnYXBxg6JjcJGCoXjR/nehec0F9aFshKF40f4NoXnNBTald2lkdGhXpmhlaWdodBKhcJeSzRl4zQFWks0YNM0BYpLNFf/NAZGSzRQ9zQI8ks0UF80CS5LNE/DNAl+SzRPMzQJ1
+     */
     view idp of edp {
         title 'EDP as IDP'
 
+        global style text_large
+
        include developer
         exclude element.tag = #internal
 
@@ -14,11 +23,13 @@ views {
                     include backstage, api
                 }
                 group 'Version Control' {
-                    include forgejocollaboration, forgejo.forgejogit, applicationspecification.application_gitrepo, applicationspecification.applicationspec_gitrepo
+                    include applicationspecification.application_gitrepo, applicationspecification.applicationspec_gitrepo
+                    include forgejogit
                 }
             }
             group 'Integration & Delivery Plane' {
-                include forgejo.forgejoRunner, imageregistry, argoCD
+                include forgejoRunner, imageregistry, argoCD
+                exclude -> argoCD ->
             }
             group 'Monitoring Plane' {
                 include monitoring, grafana
diff --git a/likec4/views/gitops-inner-outer-loop.c4 b/likec4/views/gitops-inner-outer-loop.c4
index 8578e91..7ba319b 100644
--- a/likec4/views/gitops-inner-outer-loop.c4
+++ b/likec4/views/gitops-inner-outer-loop.c4
@@ -13,14 +13,14 @@ views {
         }
  
         localbox.git -> edp.forgejogit 'git push'
-        edp.forgejo.forgejogit -> edp.forgejoRunner 'on push'
+        edp.forgejogit -> edp.forgejoRunner 'on push'
         
-        edp.forgejoRunner -> edp.forgejo.imageregistry 'pushes new image'
-        edp.forgejoRunner -> edp.forgejo.forgejogit 'pushes new appspec'
+        edp.forgejoRunner -> edp.imageregistry 'pushes new image'
+        edp.forgejoRunner -> edp.forgejogit 'pushes new appspec'
         
-        edp.forgejo.forgejogit -> edp.argoCD 'triggers deployment'
+        edp.forgejogit -> edp.argoCD 'triggers deployment'
         edp.argoCD -> cloud 'deploys application'
-        cloud -> edp.forgejo.imageregistry 'pulls image'
+        cloud -> edp.imageregistry 'pulls image'
     }
 
 }
\ No newline at end of file