diff --git a/.github/README.md b/.github/README.md
index 19d5d21edf1..ac08d998814 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -127,7 +127,7 @@ To contact the TrueCharts project:
 
 A lot of our work is based on the great effort of others. We would love to extend special thanks to these projects we owe a lot to:
 
-| <a href="https://www.truenas.com/truenas-scale/"> <img src="https://user-images.githubusercontent.com/7613738/113836934-a1764e00-978d-11eb-8e19-a087c5c1f99b.png" width="150" height="150" /> </a> | <a href="https://k8s-at-home.com/"> <img src="https://user-images.githubusercontent.com/7613738/113837194-e26e6280-978d-11eb-9632-2e1529946302.png" width="150" height="150" /> </a> | <a href="https://traefik.io/traefik/"> <img src="https://user-images.githubusercontent.com/7613738/113837353-0b8ef300-978e-11eb-873e-14769acfe1f1.png" width="150" height="150" /> </a> | <a href="https://www.authelia.com/"> <img src=" https://avatars.githubusercontent.com/u/59122411?s=200&v=4" width="150" height="150" /> </a> |
+| <a href="https://www.truenas.com/truenas-scale/"> <img src="https://user-images.githubusercontent.com/7613738/113836934-a1764e00-978d-11eb-8e19-a087c5c1f99b.png" width="150" height="150" /> </a> | <a href="https://k8s-at-home.com/"> <img src="https://user-images.githubusercontent.com/7613738/113837194-e26e6280-978d-11eb-9632-2e1529946302.png" width="150" height="150" /> </a> | <a href="https://traefik.io/traefik/"> <img src="https://user-images.githubusercontent.com/7613738/113837353-0b8ef300-978e-11eb-873e-14769acfe1f1.png" width="150" height="150" /> </a> | <a href="https://www.authelia.com/"> <img src="https://avatars.githubusercontent.com/u/59122411?s=200&v=4" width="150" height="150" /> </a> |
 | :---------------: | :---------------: | :---------------: | :---------------: |
 | <a href="https://www.truenas.com/truenas-scale/">TrueNAS SCALE</a> |  <a href="https://k8s-at-home.com/">K8S-At-Home</a> | <a href="https://traefik.io/traefik/">Traefik</a> | <a href="https://www.authelia.com/">Authelia</a> |
 
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index b9f3c8f53d7..24a6b2be8fd 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -12,7 +12,7 @@ We also document which versions of TrueNAS will recieve TrueCharts updates and f
 | ------- | ------- |------------------ | -------------- | -------------- |
 | 21.02 ALPHA | `legacy_21.02ALPHA`| :x: | :x: | Not adviced to be used
 | 21.04 ALPHA | `legacy_21.04ALPHA`| :x: | :x: | Not adviced to be used
-| 21.06 BETA | `legacy_21.06ABETA` | :white_check_mark: | :x: | Adviced to update to 21.08
-| 21.08 BETA | `legacy_21.08BETA` | :white_check_mark: | :x: | Most stable release
+| 21.06 BETA | `legacy_21.06ABETA` | :white_check_mark: | :x: | Adviced to update to 22.02 RC1
+| 21.08 BETA | `legacy_21.08BETA` | :white_check_mark: | :x: | Adviced to update to 22.02 RC1
 | 22.02 RC1 | `master` | :white_check_mark: | :white_check_mark: | Most stable release
-| Nightly | `master` | :x: | :x: | Please only submit bugreports during codefreeze
+| Nightly | `master` | :white_check_mark: | :x: | Please only submit bugreports during codefreeze