diff --git a/README.md b/README.md
index d54dedd..8aac960 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,15 @@ Navigate to the [brand-assets folder](https://github.com/openfga/community/tree/
 - [A middleware to secure routes in fiber](https://github.com/ZEISS/fiber-authz)
 - [Benchmarking & Load Testing with k6](https://github.com/jon-whit/k6-openfga-test)
 - [OpenFGA Tuple Manager](https://github.com/paulosuzart/fgamanager)
-- [OpenFGA MCP (Model Context Protocol) Server](https://github.com/evansims/openfga-mcp)
 - [Tuna - Tuple Generator for OpenFGA](https://github.com/aberforth4/tuna)
 
+### MCPs that help with OpenFGA implementation
+
+- [OpenFGA MCP Local Server](https://github.com/evansims/openfga-mcp)
+- [OpenFGA MCP Remote Server](https://github.com/aaguiarz/openfga-modeling-mcp)
+- [DeepWiki](https://docs.devin.ai/work-with-devin/deepwiki-mcp)
+- [Context7](https://github.com/upstash/context7))
+
 ### Integrations
 
 - [Custom Open Policy Agent with prototypical support for OpenFGA](https://github.com/thomasdarimont/custom-opa-openfga)
@@ -55,12 +61,13 @@ Navigate to the [brand-assets folder](https://github.com/openfga/community/tree/
 - [Tree Sitter grammar for OpenFGA](https://github.com/matoous/tree-sitter-fga)
 - [Neovim plugin for OpenFGA modeling language support](https://github.com/hedengran/fga.nvim)
 
-### API Gateways
+### API Gateways / Proxies
 
 - [Apache APISIX](https://github.com/embesozzi/apisix-authz-openfga)
 - [Zuplo](https://github.com/zuplo-samples/openfga-demo)
 - [Envoy](https://github.com/openfga/openfga-envoy)
 - [Kong](https://github.com/dol/kong-authz-openfga)
+- [Heimdall](https://github.com/dadrus/heimdall/blob/main/docs/content/guides/authz/openfga.adoc)
   
 ### Operations
 
@@ -83,9 +90,10 @@ Navigate to the [brand-assets folder](https://github.com/openfga/community/tree/
 - [Flask Demo](https://github.com/openfga/flask-demo)
 
 ### Articles & Videos
-
+  
 - [OpenFGA Live Modeling Guides](https://www.youtube.com/watch?v=5Lwy9aHXXHE&list=PLUR5l-oTFZqWaDdhEOVt_IfPOIbKo1Ypt)
-- [OpenFGA Community Presentations](https://www.youtube.com/watch?v=uHKeE4DAHpE&list=PLUR5l-oTFZqUAdAibhLw7l5IdqDnQ5gga)
+- [OpenFGA Community Presentations](https://www.youtube.com/playlist?list=PLUR5l-oTFZqUAdAibhLw7l5IdqDnQ5gga]
+- [OpenFGA Community Meetings](https://www.youtube.com/playlist?list=PLUR5l-oTFZqUneyHz-h4WzaJssgxBXdxB]
 - [OpenFGA for Python Flask Applications](https://auth0.com/blog/fine-grained-access-control-with-python-flask/)
 - [How to Implement Relationship-Based Access Control (ReBAC) in a Ruby On Rails API?](https://auth0.com/blog/what-is-rebac-and-how-to-implement-rails-api/)
 - [Securing data in your Next.js app with Okta and OpenFGA](https://vercel.com/blog/securing-data-in-your-next-js-app-with-okta-and-openfga)