diff --git a/docs/assets/software-catalog/software-model-core-entities.drawio.svg b/docs/assets/software-catalog/software-model-core-entities.drawio.svg
new file mode 100644
index 0000000000..032944659c
--- /dev/null
+++ b/docs/assets/software-catalog/software-model-core-entities.drawio.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="731px" height="111px" viewBox="-0.5 -0.5 731 111" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-01-11T19:55:14.778Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.27 Safari/537.36&quot; etag=&quot;xts4TnQgfKxHEr2rd6BT&quot; version=&quot;14.1.9&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;1VhNU9swEP01mWkPZGIb23AMCbSdQktJZ6AnRrE3tsC2XFlxEn59V/b6C4cUaBkgh0R60kry27e7cgbWJF5/kiwNz4QP0cAc+euBNR2YprFvOvijkU2JuMZ+CQSS+zSpAWb8DggcEbrkPmSdiUqISPG0C3oiScBTHYxJKVbdaQsRdXdNWQA9YOaxqI9ecl+FJXpgug3+GXgQVjsbzmE5MmfebSDFMqH9BqZ1UnzK4ZhVa9GDZiHzxaoFWccDayKFUGUrXk8g0txWtJV2Jw+M1ueWkKjHGOTfQnXlXVxDPoqty5vji9Xs955BD5OzaEmEMKWYF0L2U9C51abiCnykjrpCqlAEImHRcYMeFXyA3nGEvWbOqRApggaCN6DUhnTAlkogFKo4olFYc3VF5rr9S7eHNvWm69bQdFN1EiU3V9UCutOy0t3GrOhVdn0GidRMLKUHO2izSKhMBqB2zKPY0Ly1NiD/fAIRA54HJ1Ds7Bl2aSAhYornXYkyUnpQ29VLnQuOj9BMEYtFhgdryQEbrR0bqBDJEwRj9fQyMJ0IOTiaYyPQjQsg/mgA96nH6smyQj7AMBjiirMfp/g9ZYrNWYa2E41ZOs6W3q1+Fg0Mh8OPPVV2NbcKuYJZygr/rTBndfW14FE0EZGQha3l23Dg7yOeKSluoTVyYM4tx9mlkhykgvVOv9Ko7VAOID9XKWHVJBzDJixsJRt39LDnO459qherHP0WYtt9XnC7LxfdziOj235kdD83mkk9dakk9RgH92RRHpSsGmWMpWSb1rRUT8gev49r3dNZueB/TSdVwmvlEyz02TKGbHz+ZatIT9kcryAdYbGIBwm2PXQ1YPwe6dDkWOPHNBBz3y81DBm/Y/NiPS0S4gQXt48G9nSrbHZGUC8J1DcV2qVT7bclh73R0HQsu0P9P5aBauXqblaXF3dodxd5uULRd2yvUBQefkqN+J5CUhjpWhBcnOufuj/OpShbuohk77xkmG+tYpg9f6ZS5Pru/lCgvko1MZ9XTcz3U01IIHhm47CbNTC+3/r10fl7VpiIOBWJpvlJuUG/jgG+i6FHQObcoyukj7lAO46nEPEE3nFCOHy9jDA+s67dr5d5uhjdeEsn/Xp+JvaMLa78F1a77CUogZq4LUW2x2WfuDYzW4gxXoqYfqZ8Y8SQgXuvxhijLZL6P8Rht/mjo8wlzb9J1vEf&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 560 55 L 446.37 55" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 55 L 448.12 51.5 L 446.37 55 L 448.12 58.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 40px; margin-left: 500px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">attachesTo</div></div></div></foreignObject><text x="500" y="43" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">attachesTo</text></switch></g><rect x="560" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 55px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Resource</b><br />(e.g. SQL Database, S3 bucket, ...)</div></div></div></foreignObject><text x="635" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource...</text></switch></g><path d="M 290 72.5 L 210 72.5 L 176.37 72.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 72.5 L 178.12 69 L 176.37 72.5 L 178.12 76 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 61px; margin-left: 221px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">consumesAPI</div></div></div></foreignObject><text x="221" y="64" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesAPI</text></switch></g><rect x="20" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 55px; margin-left: 21px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="95" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">API...</text></switch></g><path d="M 290 37.5 L 176.37 37.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 37.5 L 178.12 34 L 176.37 37.5 L 178.12 41 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 21px; margin-left: 217px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">providesAPI</div></div></div></foreignObject><text x="217" y="24" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesAPI</text></switch></g><rect x="290" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 55px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="365" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Component...</text></switch></g><rect x="0" y="0" width="10" height="10" fill="#ffffff" stroke="none" pointer-events="all"/><rect x="720" y="100" width="10" height="10" fill="#ffffff" stroke="none" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/software-catalog/software-model-core-entities.png b/docs/assets/software-catalog/software-model-core-entities.png
deleted file mode 100644
index 60cb283802..0000000000
Binary files a/docs/assets/software-catalog/software-model-core-entities.png and /dev/null differ
diff --git a/docs/assets/software-catalog/software-model-entities.drawio.svg b/docs/assets/software-catalog/software-model-entities.drawio.svg
new file mode 100644
index 0000000000..eeea79f610
--- /dev/null
+++ b/docs/assets/software-catalog/software-model-entities.drawio.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="751px" height="341px" viewBox="-0.5 -0.5 751 341" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-01-11T19:56:06.530Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.27 Safari/537.36&quot; etag=&quot;Ux4LzPcf7_gubzdX-BA8&quot; version=&quot;14.1.9&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;3Vpbc5s4FP41ntl9sAcQF/vRcdLuzmS3abyzbZ92ZJCxGkCskG/59ZWMwAhhB99it3mIpSPpCB195ztHiA4YxauPFKazv0iAoo5lBKsOuO9YlmlbLv8RknUu8Uw7F4QUB7LTVjDGr0gKDSmd4wBlSkdGSMRwqgp9kiTIZ4oMUkqWarcpidRZUxgiTTD2YaRLv+CAzXJp3/K28j8QDmfFzKY7yFsm0H8JKZkncr6OBT5s/vLmGBa65EKzGQzIsiICDx0wooSwvBSvRigSti3Mlo/7sKO1fG6KEtZmwOLvGfvqP/+HFkYMvnx/eF6O/+9KLQsYzVGxDDfi+u4mvBCKwj2JIU4KMddftsh1sXVhy401kJjP4M3LGWZonEJftC45erhsxuKI10xenOIoGpGI0M1YMJ0i1/e5PGOUvKBKS+ANJoZRzlddcfH4iDK0qoikBT4iEiNG17yLbC02Q4J1IKvL7c6bjpTNKrvuSRmUYAtLxVuD84K0+SH2Nxo2oGZVFHDAyiqhbEZCksDoYSu9U+2+7fNISCqt/R0xtpbeB+eMqHuBVph9FcN7niOr36Q2Ub5fVSvropJwC1RHifq3QqOobMdtasXAnfuYkTn10R5zOZIgIA0R29NPGlFYrg0qukbPcRxXgUbXlJNRFEGGFypdNAFBqn8imC+r1G17KuRK4itU5IuRo7ZwGlIK15VuqeiQqR5eTFX0IdNphpgGynLBJ+AUaDjl+8c+TRvR+ggnPEooCIMRDhNe9vmeI+7Yd8JnMafhoWyIcRDkYEYZfoWTjT6BFrlwrty56zj3jfjZ71t1diiDiZxFIeQd+LD6/cFZ8NC1rJ6jIg30VSUX3Eb3uuxiVdnFbMsulsIuxsXYxWrJLk5LdmmNlNNCiKe5Jod3No9RNkzxLfune0b/NEr/lF51Hvbu2pq31pVczlutt5Oz8TpjKP5VkrPBrWVnA20HIGPQn6HsH3JNJjUrNMpzl3ZEaios2nMuxqOgJY+6LXm0jJPGaT79Dh6rp/N70qT3CrtnAIt1fbQcntO7TnGaOldOf3kE6Xm2xvnPSNq0kfVlZ1pIfkO9sMc1jj8/8v/3kAdVmPGxIyED4j3G3H8RaxGCXq/3+1kDR+CgfmA3BY6+NQGue57A4bi1M9bVA4d93TzbOyLPrnm8dzmPd6+VZ7c7oQPQ7oR+tkOZo/l8mcA//dkIpBtJ4O0djnrUAdsFaqJ9pgTeNOvvdbwio788m+s7q7H5ZosPIfJPKUo2gwRhh89P4qesDxeU5CXB9NlPzuv1A4HlXJ3Y9TNZSslCXGHs8tWbfrnyfmneuUlfQoQ/sw3qWZ5361le6Qq/2jnhBrKGI84JnllH0M2fE1wNQFpkGZE4JYmw80HxRdxroiQQW4LoAvvyrBDweCJ2Dqcowgn6eYNK/bBgetcOKvoL3F1kkARDceUt0rwIZhn223iydXNHfqulK5stXblO/JWdbNpI58T3SBJIYLADSIWK3A7auUFTVF4JHnhF+J5809+d9zRdMrwF1PJy57B3ks0A9/YDXKWky6P2wAxmc7loqvHH1inpkkC2a/izjgTymx5x8F33DoepPbBpg/0OVl9g36n5SP4El/SqUTim4eLz+qG7eAUuoQPn38fGz29qrvRGCFVDZcLj/YlRsgI5qwFydWgcEwQbTaEfrK5uCtnq1T4aAqbunaDBVPXXSC1MxavbD8JykG2/ugMPPwA=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="20" y="90" width="150" height="70" fill="#ffe6cc" stroke="#d79b00" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 125px; margin-left: 21px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Domain</b></div></div></div></foreignObject><text x="95" y="129" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Domain</text></switch></g><path d="M 402.5 250 L 402.5 166.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 402.5 161.12 L 406 168.12 L 402.5 166.37 L 399 168.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 181px; margin-left: 381px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="381" y="184" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><path d="M 327.5 160 L 327.5 243.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 327.5 248.88 L 324 241.88 L 327.5 243.63 L 331 241.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 181px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">consumesApi</div></div></div></foreignObject><text x="291" y="184" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesApi</text></switch></g><rect x="290" y="90" width="150" height="70" fill="#ffe6cc" stroke="#d79b00" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 125px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>System</b></div></div></div></foreignObject><text x="365" y="129" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">System</text></switch></g><path d="M 710 55 L 730 55 L 730 205 L 716.37 205" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 711.12 205 L 718.12 201.5 L 716.37 205 L 718.12 208.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 130px; margin-left: 700px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">attachesTo</div></div></div></foreignObject><text x="700" y="133" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">attachesTo</text></switch></g><path d="M 560 55 L 500 55 L 500 107.5 L 446.37 107.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 107.5 L 448.12 104 L 446.37 107.5 L 448.12 111 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 40px; margin-left: 530px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="530" y="43" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="560" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 55px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Resource</b><br />(e.g. SQL Database, S3 bucket, ...)</div></div></div></foreignObject><text x="635" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource...</text></switch></g><path d="M 672.5 240 L 672.5 302.5 L 446.37 302.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 302.5 L 448.12 299 L 446.37 302.5 L 448.12 306 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 291px; margin-left: 511px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">consumesAPI</div></div></div></foreignObject><text x="511" y="294" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesAPI</text></switch></g><rect x="290" y="250" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 285px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="365" y="289" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">API...</text></switch></g><path d="M 597.5 240 L 597.5 267.5 L 446.37 267.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 267.5 L 448.12 264 L 446.37 267.5 L 448.12 271 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 251px; margin-left: 510px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">providesAPI</div></div></div></foreignObject><text x="510" y="254" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesAPI</text></switch></g><path d="M 560 205 L 500 205 L 500 142.5 L 446.37 142.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 142.5 L 448.12 139 L 446.37 142.5 L 448.12 146 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 530px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="530" y="193" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="560" y="170" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 205px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="635" y="209" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Component...</text></switch></g><path d="M 290 107.5 L 176.37 107.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 107.5 L 178.12 104 L 176.37 107.5 L 178.12 111 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 91px; margin-left: 230px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="230" y="94" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><path d="M 290 142.5 L 240 143 L 240 285 L 283.63 285" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 288.88 285 L 281.88 288.5 L 283.63 285 L 281.88 281.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 180px; margin-left: 200px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">providesApi</div></div></div></foreignObject><text x="200" y="183" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesApi</text></switch></g><rect x="0" y="0" width="20" height="20" fill="#ffffff" stroke="none" pointer-events="all"/><rect x="720" y="310" width="30" height="30" fill="#ffffff" stroke="none" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/system-model.md b/docs/features/software-catalog/system-model.md
index e9a801fcd2..f0ead20664 100644
--- a/docs/features/software-catalog/system-model.md
+++ b/docs/features/software-catalog/system-model.md
@@ -23,7 +23,7 @@ We model software in the Backstage catalogue using these three core entities
 - **Resources** are physical or virtual infrastructure needed to operate a
   component
 
-![](../../assets/software-catalog/software-model-core-entities.png)
+![](../../assets/software-catalog/software-model-core-entities.drawio.svg)
 
 ### Component
 
@@ -73,6 +73,8 @@ these entities using the following (optional) concepts:
   function
 - **Domains** relate entities and systems to part of the business
 
+![](../../assets/software-catalog/software-model-entities.drawio.svg)
+
 ### System
 
 With increasing complexity in software, systems form an important abstraction