diff --git a/tools/github/generate-release-body.ts b/tools/github/generate-release-body.ts
index 73e9bbe459..1500aff52e 100644
--- a/tools/github/generate-release-body.ts
+++ b/tools/github/generate-release-body.ts
@@ -44,9 +44,7 @@ async function main() {
 
   const previousTag = argv.from;
   const newTag = argv.to;
-
-  // TODO: this section should be optional with default to ["polkadot-sdk", "frontier"]
-  const moduleLinks = ["polkadot-sdk", "frontier"].map((repoName) => ({
+  const moduleLinks = ["polkadot-sdk", "frontier", "moonkit"].map((repoName) => ({
     name: repoName,
     link: getCompareLink(repoName, previousTag, newTag),
   }));
diff --git a/tools/github/generate-runtimes-body.ts b/tools/github/generate-runtimes-body.ts
index 0f5b73f0ce..80938e83ea 100644
--- a/tools/github/generate-runtimes-body.ts
+++ b/tools/github/generate-runtimes-body.ts
@@ -99,7 +99,7 @@ async function main() {
     getRuntimeInfo(argv["srtool-report-folder"], runtimeName)
   );
 
-  const moduleLinks = ["polkadot-sdk", "frontier"].map((repoName) => ({
+  const moduleLinks = ["polkadot-sdk", "frontier", "moonkit"].map((repoName) => ({
     name: repoName,
     link: getCompareLink(repoName, previousTag, newTag),
   }));
diff --git a/tools/github/print-client-release-issue.ts b/tools/github/print-client-release-issue.ts
index 9c7c38ac46..3339a42fe6 100644
--- a/tools/github/print-client-release-issue.ts
+++ b/tools/github/print-client-release-issue.ts
@@ -30,20 +30,20 @@ async function main() {
     `-f from=runtime-${previousVersion} -f to=runtime-${newVersion}\`
 - [ ] Review the generated Draft and clean a bit the messages if needed (keep it draft).
 - [ ] Update moonbeam-networks stagenet (moonsama/moonlama) config.json to include:
-  - \`\`\`
+\`\`\`
   "binaries": [
     {
-      "docker": "docker.io/moonbeamfoundation/moonbeam:${newVersion}-rc",
+      "docker": "moonbeamfoundation/moonbeam:v${newVersion}-rc",
       "path": "/moonbeam/moonbeam",
       "name": "moonbeam"
     },
     {
-      "docker": "docker.io/moonbeamfoundation/moonbeam:${newVersion}-rc",
+      "docker": "moonbeamfoundation/moonbeam:v${newVersion}-rc",
       "path": "/moonbeam/moonbeam-skylake",
       "name": "moonbeam-skylake"
     }
   ]
-  \`\`\`
+\`\`\`
 (matching your ${newVersion} tag) and increase the config version + 1.
 - [ ] Test the new client on stagenet (moonsama/moonlama).
 - [ ] Publish the client release draft.