diff --git a/.github/ISSUE_TEMPLATE/simpleissue.yaml b/.github/ISSUE_TEMPLATE/simpleissue.yaml
new file mode 100644
index 00000000000..16c0db0c0aa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/simpleissue.yaml
@@ -0,0 +1,14 @@
+name: Fork Issue
+description: Create a simple issue to track changes when working inside the fork, before going to main.
+title: "[Fork] "
+labels: []
+assignees: []
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Describe the purpose of this fork and any planned changes
+      placeholder: Type your description here...
+    validations:
+      required: true
diff --git a/.gitignore b/.gitignore
index 211d06aa199..3d1bfd00e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ docs/_site/
 
 #Logging
 logs
+.devcontainer
diff --git a/src/core/prompts/system.ts b/src/core/prompts/system.ts
index 91bbd073870..b949a9f0179 100644
--- a/src/core/prompts/system.ts
+++ b/src/core/prompts/system.ts
@@ -56,7 +56,7 @@ async function generatePrompt(
 
 	// Get the full mode config to ensure we have the role definition
 	const modeConfig = getModeBySlug(mode, customModeConfigs) || modes.find((m) => m.slug === mode) || modes[0]
-	const roleDefinition = promptComponent?.roleDefinition || modeConfig.roleDefinition
+	const roleDefinition = modeConfig?.roleDefinition || promptComponent?.roleDefinition
 
 	const basePrompt = `${roleDefinition}