diff --git a/.all-contributorsrc b/.all-contributorsrc
index c7290b7..b9b16b1 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -831,6 +831,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "lechnerc77",
+      "name": "Christian Lechner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22294087?v=4",
+      "profile": "https://github.com/lechnerc77",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 3badcb9..ef8fb61 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Powered by Awesome Copilot](https://img.shields.io/badge/Powered_by-Awesome_Copilot-blue?logo=githubcopilot)](https://aka.ms/awesome-github-copilot)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-91-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-92-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 A community created collection of custom agents, prompts, and instructions to supercharge your GitHub Copilot experience across different domains, languages, and use cases.
@@ -253,6 +253,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/spectatora"><img src="https://avatars.githubusercontent.com/u/1385755?v=4?s=100" width="100px;" alt="spectatora"/><br /><sub><b>spectatora</b></sub></a><br /><a href="https://github.com/github/awesome-copilot/commits?author=spectatora" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mike-Hanna"><img src="https://avatars.githubusercontent.com/u/50142889?v=4?s=100" width="100px;" alt="Michael"/><br /><sub><b>Michael</b></sub></a><br /><a href="https://github.com/github/awesome-copilot/commits?author=Mike-Hanna" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lechnerc77"><img src="https://avatars.githubusercontent.com/u/22294087?v=4?s=100" width="100px;" alt="Christian Lechner"/><br /><sub><b>Christian Lechner</b></sub></a><br /><a href="https://github.com/github/awesome-copilot/commits?author=lechnerc77" title="Code">💻</a></td>
+    </tr>
   </tbody>
   <tfoot>
     <tr>
diff --git a/instructions/azure-verified-modules-terraform.instructions.md b/instructions/azure-verified-modules-terraform.instructions.md
index dc47429..1828cfb 100644
--- a/instructions/azure-verified-modules-terraform.instructions.md
+++ b/instructions/azure-verified-modules-terraform.instructions.md
@@ -34,10 +34,12 @@ More details on the AVM process can be found in the [Azure Verified Modules Cont
 
 ### Official AVM Index
 
-- **Terraform Resources**: `https://azure.github.io/Azure-Verified-Modules/indexes/terraform/tf-resource-modules/`
-- **Terraform Patterns**: `https://azure.github.io/Azure-Verified-Modules/indexes/terraform/tf-pattern-modules/`
-- **Bicep Resources**: `https://azure.github.io/Azure-Verified-Modules/indexes/bicep/bicep-resource-modules/`
-- **Bicep Patterns**: `https://azure.github.io/Azure-Verified-Modules/indexes/bicep/bicep-pattern-modules/`
+> **Note:** The following links always point to the latest version of the CSV files on the main branch. As intended, this means the files may change over time. If you require a point-in-time version, consider using a specific release tag in the URL.
+
+- **Terraform Resource Modules**: `https://raw.githubusercontent.com/Azure/Azure-Verified-Modules/refs/heads/main/docs/static/module-indexes/TerraformResourceModules.csv`
+- **Terraform Pattern Modules**: `https://raw.githubusercontent.com/Azure/Azure-Verified-Modules/refs/heads/main/docs/static/module-indexes/TerraformPatternModules.csv`
+- **Terraform Utility Modules**: `https://raw.githubusercontent.com/Azure/Azure-Verified-Modules/refs/heads/main/docs/static/module-indexes/TerraformUtilityModules.csv`
+
 
 ## Terraform Module Usage
 
diff --git a/prompts/conventional-commit.prompt.md b/prompts/conventional-commit.prompt.md
index a5e056f..c517d43 100644
--- a/prompts/conventional-commit.prompt.md
+++ b/prompts/conventional-commit.prompt.md
@@ -1,6 +1,6 @@
 ---
 description: 'Prompt and workflow for generating conventional commit messages using a structured XML format. Guides users to create standardized, descriptive commit messages in line with the Conventional Commits specification, including instructions, examples, and validation.'
-tools: ['run_in_terminal', 'get_terminal_output']
+tools: ['runCommands/runInTerminal', 'runCommands/getTerminalOutput']
 ---
 
 ### Instructions
diff --git a/prompts/git-flow-branch-creator.prompt.md b/prompts/git-flow-branch-creator.prompt.md
index d3da709..127f0c3 100644
--- a/prompts/git-flow-branch-creator.prompt.md
+++ b/prompts/git-flow-branch-creator.prompt.md
@@ -1,6 +1,6 @@
 ---
 description: 'Intelligent Git Flow branch creator that analyzes git status/diff and creates appropriate branches following the nvie Git Flow branching model.'
-tools: ['run_in_terminal', 'get_terminal_output']
+tools: ['runCommands/runInTerminal', 'runCommands/getTerminalOutput']
 mode: 'agent'
 ---