diff --git a/.github/ct-install.yaml b/.github/ct-install.yaml
index 0c66386fe7f..188edee3832 100644
--- a/.github/ct-install.yaml
+++ b/.github/ct-install.yaml
@@ -23,12 +23,12 @@ excluded-charts:
   - charts/stable/foundryvtt
   - charts/stable/foundryvtt
   - charts/stable/heimdall
+  - charts/stable/mc-router
   - charts/stable/multus
   - charts/stable/orbital-sync
   - charts/stable/plex-meta-manager
   - charts/stable/pod-gateway
   - charts/stable/promcord
-  - charts/stable/promcord
   - charts/stable/rdesktop
   - charts/stable/reg
   - charts/stable/romm
diff --git a/charts/incubator/mc-router/.helmignore b/charts/stable/mc-router/.helmignore
similarity index 100%
rename from charts/incubator/mc-router/.helmignore
rename to charts/stable/mc-router/.helmignore
diff --git a/charts/incubator/mc-router/CHANGELOG.md b/charts/stable/mc-router/CHANGELOG.md
similarity index 100%
rename from charts/incubator/mc-router/CHANGELOG.md
rename to charts/stable/mc-router/CHANGELOG.md
diff --git a/charts/incubator/mc-router/Chart.yaml b/charts/stable/mc-router/Chart.yaml
similarity index 89%
rename from charts/incubator/mc-router/Chart.yaml
rename to charts/stable/mc-router/Chart.yaml
index 08f67e2cc59..e8cb406044a 100644
--- a/charts/incubator/mc-router/Chart.yaml
+++ b/charts/stable/mc-router/Chart.yaml
@@ -5,7 +5,7 @@ dependencies:
     repository: https://library-charts.truecharts.org
     version: 12.14.6
 deprecated: false
-description: Routes Minecraft client connections to backend servers.
+description: Lightweight multiplexer/proxy for Minecraft-Java servers.
 home: https://truecharts.org/charts/incubator/mc-router
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/mc-router.png
 keywords:
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/mc-router
   - https://github.com/itzg/mc-router
 type: application
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - minecraft
diff --git a/charts/incubator/mc-router/README.md b/charts/stable/mc-router/README.md
similarity index 100%
rename from charts/incubator/mc-router/README.md
rename to charts/stable/mc-router/README.md
diff --git a/charts/stable/mc-router/docs/validation.md b/charts/stable/mc-router/docs/validation.md
new file mode 100644
index 00000000000..7959f58e28d
--- /dev/null
+++ b/charts/stable/mc-router/docs/validation.md
@@ -0,0 +1,23 @@
+# Input Validation
+
+**`Domain and Minecraft Service`**
+
+Accepts:
+
+- domain=service:port
+- IP or DNS host
+- Characters (`0-9`, `a-z`, `A-Z`, `-`, `.`)
+- Port
+
+Accepted formats are:
+
+- `minecraft.local=minecraft-java.ix-minecraft-java.svc.cluster.local:25565`
+- `minecraft.local=localhost:25565`
+- `minecraft.local=0.0.0.0:25565`
+
+Regex used to match this: `^$|^(http(s)?:\/\/([a-zA-Z0-9.-]*)(:\d{0,5})?,?)*$`
+You can try live [here](https://regex101.com/r/u2ifZm/1)
+
+---
+
+_If you find a field that you think it needs validation, please open an issue on github_
diff --git a/charts/incubator/mc-router/icon.png b/charts/stable/mc-router/icon.png
similarity index 100%
rename from charts/incubator/mc-router/icon.png
rename to charts/stable/mc-router/icon.png
diff --git a/charts/incubator/mc-router/questions.yaml b/charts/stable/mc-router/questions.yaml
similarity index 97%
rename from charts/incubator/mc-router/questions.yaml
rename to charts/stable/mc-router/questions.yaml
index ca80d16f7d1..f10f935c2f7 100644
--- a/charts/incubator/mc-router/questions.yaml
+++ b/charts/stable/mc-router/questions.yaml
@@ -28,7 +28,7 @@ questions:
                 label: Domain and Minecraft Service
                 schema:
                   type: string
-                  default: "minecraft.local=localhost:25565"
+                  default: "minecraft.local=minecraft-java.ix-minecraft-java.svc.cluster.local:25565"
                   valid_chars: '^([\w.-]+)=([A-Za-z0-9.-]+):(\d+)$'
                   required: true
 # Include{serviceRoot}
diff --git a/charts/incubator/mc-router/templates/NOTES.txt b/charts/stable/mc-router/templates/NOTES.txt
similarity index 100%
rename from charts/incubator/mc-router/templates/NOTES.txt
rename to charts/stable/mc-router/templates/NOTES.txt
diff --git a/charts/incubator/mc-router/templates/_secrets.tpl b/charts/stable/mc-router/templates/_secrets.tpl
similarity index 100%
rename from charts/incubator/mc-router/templates/_secrets.tpl
rename to charts/stable/mc-router/templates/_secrets.tpl
diff --git a/charts/incubator/mc-router/templates/common.yaml b/charts/stable/mc-router/templates/common.yaml
similarity index 100%
rename from charts/incubator/mc-router/templates/common.yaml
rename to charts/stable/mc-router/templates/common.yaml
diff --git a/charts/incubator/mc-router/values.yaml b/charts/stable/mc-router/values.yaml
similarity index 89%
rename from charts/incubator/mc-router/values.yaml
rename to charts/stable/mc-router/values.yaml
index 8b061508491..711680b7fd6 100644
--- a/charts/incubator/mc-router/values.yaml
+++ b/charts/stable/mc-router/values.yaml
@@ -16,8 +16,8 @@ service:
         port: 25565
 
 mcrouter:
-  host_minecraft:
-    - "minecraft.local=localhost:25566"
+  host_minecraft: []
+  #  - "minecraft.local=minecraft-java.ix-minecraft-java.svc.cluster.local:25565"
 
 workload:
   main: