diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index 789042f50fe..d2b8d2c42eb 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -38,7 +38,7 @@ jobs:
           path: catalog
       - name: Remove if release already exists
         run: |
-          for train in stable incubator
+          for train in stable incubator develop non-free insecure
           do
             for chart in master/${train}/*; do
               if [ -d "${chart}" ]; then
@@ -52,7 +52,7 @@ jobs:
           done
       - name: fetch dependencies
         run: |
-          for train in stable incubator
+          for train in stable incubator develop non-free insecure
           do
             for chart in master/${train}/*; do
               if [ -d "${chart}" ]; then
@@ -64,7 +64,7 @@ jobs:
           done
       - name: Add Chart release
         run: |
-          for train in stable incubator
+          for train in stable incubator develop non-free insecure
           do
             for chart in master/${train}/*; do
               if [ -d "${chart}" ]; then
@@ -78,7 +78,7 @@ jobs:
           done
       - name: Apply SCALE Patches
         run: |
-          for train in stable incubator
+          for train in stable incubator develop non-free insecure
           do
             for chart in catalog/${train}/*; do
               if [ -d "${chart}" ]; then
diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index 2bf3cf70d6f..47a7ce621a3 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -49,7 +49,9 @@ jobs:
           changed:
           - 'stable/**'
           - 'incubator/**'
-          - 'dev/**'
+          - 'develop/**'
+          - 'insecure/**'
+          - 'non-free/**'
     - run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
     - id: reduce
       run: |
@@ -76,8 +78,12 @@ jobs:
               train="stable"
             elif test -f "./incubator/${{ matrix.app }}/Chart.yaml"; then
               train="incubator"
+            elif test -f "./insecure/${{ matrix.app }}/Chart.yaml"; then
+              train="insecure"
+            elif test -f "./non-free/${{ matrix.app }}/Chart.yaml"; then
+              train="non-free"
             else
-              train="dev"
+              train="develop"
             fi
             echo ::set-output name=train::${train}
 
diff --git a/.github/workflows/docs.copy.yaml b/.github/workflows/docs.copy.yaml
index 27d01a9bacd..18a7985f628 100644
--- a/.github/workflows/docs.copy.yaml
+++ b/.github/workflows/docs.copy.yaml
@@ -57,35 +57,22 @@ jobs:
           sed -i '1s/^/# NOTICE<br>\n\n/' docs/about/legal/NOTICE.md
           ls docs/
 
-      - name: Copy stable Apps readme to website
+      - name: Copy Apps readme to website
         run: |
-          for chart in stable/*; do
-            if [ -d "${chart}" ]; then
-                chartname=$(basename ${chart})
-                echo "Processing: ${chart}"
-                mkdir -p docs/apps/stable/${chartname} || echo "app path already exists, continuing..."
-                yes | cp -rf ${chart}/README.md docs/apps/stable/${chartname}/index.md || echo "readme copy failed, continuing..."
-                yes | cp -rf ${chart}/CONFIG.md docs/apps/stable/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
-                yes | cp -rf ${chart}/LICENSE docs/apps/stable/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
-                sed -i '1s/^/# License<br>\n\n/' docs/apps/stable/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
-            fi
+          for train in stable incubator develop non-free insecure; do
+            for chart in ${train}/*; do
+              if [ -d "${chart}" ]; then
+                  chartname=$(basename ${chart})
+                  echo "Processing: ${chart}"
+                  mkdir -p docs/apps/${train}/${chartname} || echo "app path already exists, continuing..."
+                  yes | cp -rf ${chart}/README.md docs/apps/${train}/${chartname}/index.md || echo "readme copy failed, continuing..."
+                  yes | cp -rf ${chart}/CONFIG.md docs/apps/${train}/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
+                  yes | cp -rf ${chart}/LICENSE docs/apps/${train}/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
+                  sed -i '1s/^/# License<br>\n\n/' docs/apps/${train}/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
+              fi
+            done
+          ls docs/apps/${train}/
           done
-          ls docs/apps/stable/
-
-      - name: Copy incubator Apps readme to website
-        run: |
-          for chart in incubator/*; do
-            if [ -d "${chart}" ]; then
-                chartname=$(basename ${chart})
-                echo "Processing: ${chart}"
-                mkdir -p docs/apps/incubator/${chartname} || echo "app path already exists, continuing..."
-                yes | cp -rf ${chart}/README.md docs/apps/incubator/${chartname}/index.md || echo "readme copy failed, continuing..."
-                yes | cp -rf ${chart}/CONFIG.md docs/apps/incubator/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
-                yes | cp -rf ${chart}/LICENSE docs/apps/incubator/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
-                sed -i '1s/^/# License<br>\n\n/' docs/apps/incubator/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
-            fi
-          done
-          ls docs/apps/incubator/
 
       - name: Commit and Push updated docs
         run: |
diff --git a/.tools/gen-helm-docs.sh b/.tools/gen-helm-docs.sh
index 4203abc7624..0708e8987b6 100755
--- a/.tools/gen-helm-docs.sh
+++ b/.tools/gen-helm-docs.sh
@@ -18,39 +18,22 @@ readme_template="${repository}/.tools/templates/docs/README.md.gotmpl"
 config_template="${repository}/.tools/templates/docs/CONFIG.md.gotmpl"
 root="${repository}"
 
-for chart in stable/*; do
-  if [ -d "${chart}" ]; then
-      maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      chartname=$(basename ${chart})
-      echo "-] Copying templates to ${repository}/${chart}"
-      helm-docs \
-          --ignore-file=".helmdocsignore" \
-          --output-file="README.md" \
-          --template-files="${repository}/.tools/templates/docs/README.md.gotmpl" \
-          --chart-search-root="${chart}"
-      helm-docs \
-          --ignore-file=".helmdocsignore" \
-          --output-file="CONFIG.md" \
-          --template-files="${repository}/.tools/templates/docs/CONFIG.md.gotmpl" \
-          --chart-search-root="${chart}"
-
-  fi
-done
-
-for chart in incubator/*; do
-  if [ -d "${chart}" ]; then
-      maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      chartname=$(basename ${chart})
-      echo "-] Copying templates to ${repository}/${chart}"
-      helm-docs \
-          --ignore-file=".helmdocsignore" \
-		  --output-file="README.md" \
-          --template-files="${repository}/.tools/templates/docs/README.md.gotmpl" \
-          --chart-search-root="${chart}"
-      helm-docs \
-          --ignore-file=".helmdocsignore" \
-          --output-file="CONFIG.md" \
-          --template-files="${repository}/.tools/templates/docs/CONFIG.md.gotmpl" \
-          --chart-search-root="${chart}"
-  fi
+for train in stable incubator develop non-free insecure; do
+  for chart in ${train}/*; do
+    if [ -d "${chart}" ]; then
+        maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+        chartname=$(basename ${chart})
+        echo "-] Copying templates to ${repository}/${chart}"
+        helm-docs \
+            --ignore-file=".helmdocsignore" \
+            --output-file="README.md" \
+            --template-files="${repository}/.tools/templates/docs/README.md.gotmpl" \
+            --chart-search-root="${chart}"
+        helm-docs \
+            --ignore-file=".helmdocsignore" \
+            --output-file="CONFIG.md" \
+            --template-files="${repository}/.tools/templates/docs/CONFIG.md.gotmpl" \
+            --chart-search-root="${chart}"
+    fi
+  done
 done
diff --git a/dev/.gitkeep b/develop/.gitkeep
similarity index 100%
rename from dev/.gitkeep
rename to develop/.gitkeep
diff --git a/insecure/.gitkeep b/insecure/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/non-free/.gitkeep b/non-free/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d