diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index 8464fbeaebb..3e6ac337193 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -11,8 +11,89 @@ on:
- '.github/workflows/apps.release.yaml'
jobs:
+ catalog-test:
+ runs-on: ubuntu-latest
+ container:
+ image: ixsystems/catalog_validation:latest
+
+ steps:
+ - uses: actions/checkout@v2
+ name: Checkout
+ - name: Install Helm
+ uses: azure/setup-helm@v1
+ with:
+ version: v3.5.3
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ token: ${{ secrets.BOT_TOKEN }}
+ path: master
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ repository: truecharts/catalog
+ token: ${{ secrets.BOT_TOKEN }}
+ path: catalog
+ - name: Remove if release already exists
+ run: |
+ for train in stable incubator dev
+ for chart in master/${train}/*; do
+ if [ -d "${chart}" ]; then
+ maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+ chartname=$(basename ${chart})
+ echo "Processing... cleanup-existing... Chart: ${chartname} - Version: ${maxchartversion}"
+ rm -Rf catalog/test/${chartname}/${maxchartversion} || echo "Chart release ${chartname} with version ${maxchartversion} does not exist yet... Skipping..."
+ rm -Rf catalog/test/${chartname}/item.yaml || echo "No old catalog item.yaml found for ${chartname}"
+ fi
+ done
+ done
+ - name: fetch dependencies
+ run: |
+ helm dependency update master/.test/*
+ - name: Add Chart release
+ run: |
+ for train in stable incubator dev
+ for chart in master/${train}/*; do
+ if [ -d "${chart}" ]; then
+ maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+ chartname=$(basename ${chart})
+ echo "Processing... Copying charts... Chart: ${chartname} - Version: ${maxchartversion}"
+ mkdir -p catalog/test/${chartname}/${maxchartversion}
+ cp -Rf ${chart}/* catalog/${train}/${chartname}/${maxchartversion}/
+ fi
+ done
+ done
+ - name: Apply SCALE Patches
+ run: |
+ for train in stable incubator dev
+ for chart in catalog/${train}/*; do
+ if [ -d "${chart}" ]; then
+ maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+ chartname=$(basename ${chart})
+ path="${chart}/${maxfolderversion}"
+ echo "Processing... Applying SCALE patch... Chart: ${chartname} - Version: ${maxfolderversion}"
+ mv ${path}/SCALE/item.yaml catalog/${train}/${chartname}/
+ mv ${path}/SCALE/ix_values.yaml ${path}/
+ mv ${path}/SCALE/questions.yaml ${path}/
+ cp -rf ${path}/SCALE/templates/* ${path}/templates || echo "ignoring templates directory..."
+ rm -rf ${path}/SCALE/templates
+ mv ${path}/values.yaml ${path}/test_values.yaml
+ touch ${path}/values.yaml
+ description=$(cat ${path}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
+ echo "${description}" >> ${path}/app-readme.md
+ fi
+ done
+ done
+ - name: Validate catalog format
+ run: |
+ cd catalog
+ /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD"
+
release:
runs-on: ubuntu-latest
+ needs: catalog-test
steps:
- name: Install Helm
uses: azure/setup-helm@v1
@@ -33,49 +114,55 @@ jobs:
path: catalog
- name: Remove if release already exists
run: |
- for chart in master/.test/*; do
- if [ -d "${chart}" ]; then
- maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing... cleanup-existing... Chart: ${chartname} - Version: ${maxchartversion}"
-
- rm -Rf catalog/test/${chartname}/${maxchartversion} || echo "Chart release ${chartname} with version ${maxchartversion} does not exist yet... Skipping..."
- rm -Rf catalog/test/${chartname}/item.yaml || echo "No old catalog item.yaml found for ${chartname}"
- fi
+ for train in stable incubator dev
+ for chart in master/${train}/*; do
+ if [ -d "${chart}" ]; then
+ maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+ chartname=$(basename ${chart})
+ echo "Processing... cleanup-existing... Chart: ${chartname} - Version: ${maxchartversion}"
+ rm -Rf catalog/test/${chartname}/${maxchartversion} || echo "Chart release ${chartname} with version ${maxchartversion} does not exist yet... Skipping..."
+ rm -Rf catalog/test/${chartname}/item.yaml || echo "No old catalog item.yaml found for ${chartname}"
+ fi
+ done
done
- name: fetch dependencies
run: |
helm dependency update master/.test/*
- name: Add Chart release
run: |
- for chart in master/.test/*; do
- if [ -d "${chart}" ]; then
- maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing... Copying charts... Chart: ${chartname} - Version: ${maxchartversion}"
- mkdir -p catalog/test/${chartname}/${maxchartversion}
- cp -Rf ${chart}/* catalog/test/${chartname}/${maxchartversion}/
- fi
+ for train in stable incubator dev
+ for chart in master/${train}/*; do
+ if [ -d "${chart}" ]; then
+ maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+ chartname=$(basename ${chart})
+ echo "Processing... Copying charts... Chart: ${chartname} - Version: ${maxchartversion}"
+ mkdir -p catalog/test/${chartname}/${maxchartversion}
+ cp -Rf ${chart}/* catalog/${train}/${chartname}/${maxchartversion}/
+ fi
+ done
done
- name: Apply SCALE Patches
run: |
- for chart in catalog/test/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- chartname=$(basename ${chart})
- path="${chart}/${maxfolderversion}"
- echo "Processing... Applying SCALE patch... Chart: ${chartname} - Version: ${maxfolderversion}"
- mv ${path}/SCALE/item.yaml catalog/test/${chartname}/
- mv ${path}/SCALE/ix_values.yaml ${path}/
- mv ${path}/SCALE/questions.yaml ${path}/
- cp -rf ${path}/SCALE/templates/* ${path}/templates || echo "ignoring templates directory..."
- rm -rf ${path}/SCALE/templates
- mv ${path}/values.yaml ${path}/test_values.yaml
- touch ${path}/values.yaml
- description=$(cat ${path}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
- echo "${description}" >> ${path}/app-readme.md
- fi
+ for train in stable incubator dev
+ for chart in catalog/${train}/*; do
+ if [ -d "${chart}" ]; then
+ maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+ chartname=$(basename ${chart})
+ path="${chart}/${maxfolderversion}"
+ echo "Processing... Applying SCALE patch... Chart: ${chartname} - Version: ${maxfolderversion}"
+ mv ${path}/SCALE/item.yaml catalog/${train}/${chartname}/
+ mv ${path}/SCALE/ix_values.yaml ${path}/
+ mv ${path}/SCALE/questions.yaml ${path}/
+ cp -rf ${path}/SCALE/templates/* ${path}/templates || echo "ignoring templates directory..."
+ rm -rf ${path}/SCALE/templates
+ mv ${path}/values.yaml ${path}/test_values.yaml
+ touch ${path}/values.yaml
+ description=$(cat ${path}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
+ echo "${description}" >> ${path}/app-readme.md
+ fi
+ done
done
+
- name: Commit and Push new App releases
run: |
cd catalog
diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index cb11c17e8ec..2bf3cf70d6f 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -8,43 +8,31 @@ on:
- '**'
paths:
- 'stable/**'
- - '!stable/**/*.md'
- - '!stable/**/README.md'
- - '!stable/**/README.md.gotmpl'
- - '!stable/**/app-readme.md'
- - '!stable/**/app-readme.md.gotmpl'
- - '!stable/**/docs/*'
+ - '!stable/*.md'
+ - '!stable/README.md'
+ - '!stable/README.md.gotmpl'
+ - '!stable/app-readme.md'
+ - '!stable/app-readme.md.gotmpl'
+ - '!stable/docs/*'
- 'incubator/**'
- - '!incubator/**/*.md'
- - '!incubator/**/README.md'
- - '!incubator/**/README.md.gotmpl'
- - '!incubator/**/app-readme.md'
- - '!incubator/**/app-readme.md.gotmpl'
- - '!incubator/**/docs/*'
+ - '!incubator/*.md'
+ - '!incubator/README.md'
+ - '!incubator/README.md.gotmpl'
+ - '!incubator/app-readme.md'
+ - '!incubator/app-readme.md.gotmpl'
+ - '!incubator/docs/*'
- 'dev/**'
- - '!dev/**/*.md'
- - '!dev/**/README.md'
- - '!dev/**/README.md.gotmpl'
- - '!dev/**/app-readme.md'
- - '!dev/**/app-readme.md.gotmpl'
- - '!dev/**/docs/*'
+ - '!dev/*.md'
+ - '!dev/README.md'
+ - '!dev/README.md.gotmpl'
+ - '!dev/app-readme.md'
+ - '!dev/app-readme.md.gotmpl'
+ - '!dev/docs/*'
- '.github/workflows/apps.test.yaml'
- '.github/ct-install.yaml'
- '.github/ct-lint.yaml'
jobs:
- catalog-test:
- runs-on: ubuntu-latest
- container:
- image: ixsystems/catalog_validation:latest
-
- steps:
- - uses: actions/checkout@v2
- name: Checkout
- - name: Validate catalog format
- run: |
- /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD"
-
changes:
name: Get changed Apps
runs-on: ubuntu-20.04
@@ -69,7 +57,7 @@ jobs:
echo ::set-output name=apps::${APPS}
app-tests:
- needs: [catalog-test, changes]
+ needs: [changes]
name: App Tests
runs-on: ubuntu-latest
strategy:
@@ -84,19 +72,14 @@ jobs:
- name: Prepare-Lint
id: prep-lint
run: |
- if test -f "./stable/${{ matrix.app }}/item.yaml"; then
+ if test -f "./stable/${{ matrix.app }}/Chart.yaml"; then
train="stable"
- elif test -f "./incubator/${{ matrix.app }}/item.yaml"; then
+ elif test -f "./incubator/${{ matrix.app }}/Chart.yaml"; then
train="incubator"
else
train="dev"
fi
echo ::set-output name=train::${train}
- maxfolderversion=$(ls -l ${train}/${{ matrix.app }} | grep ^d | awk '{print $9}' | tail -n 1)
- echo "Detected folder version: ${maxfolderversion}"
- mkdir ${train}/${{ matrix.app }}/${maxfolderversion}/ci || exit 0
- cp ${train}/${{ matrix.app }}/${maxfolderversion}/test_values.yaml ${train}/${{ matrix.app }}/${maxfolderversion}/ci/test-values.yaml
- echo ::set-output name=maxfolderversion::${maxfolderversion}
- name: Install Helm
uses: azure/setup-helm@v1
@@ -113,12 +96,7 @@ jobs:
- name: Run chart-testing (lint)
id: lint
- run: ct lint --config .github/ct-lint.yaml --charts '${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/${{ steps.prep-lint.outputs.maxfolderversion }}'
-
- - name: Prepare-Test
- run: |
- mv -f ${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/${{ steps.prep-lint.outputs.maxfolderversion }}/* ${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/
- rm -Rf ${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/${{ steps.prep-lint.outputs.maxfolderversion }}
+ run: ct lint --config .github/ct-lint.yaml --charts '${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}'
- name: Create k3d cluster
uses: nolar/setup-k3d-k3s@v1
diff --git a/.github/workflows/charts.renovate.yaml b/.github/workflows/charts.renovate.yaml
deleted file mode 100644
index b0f384284e9..00000000000
--- a/.github/workflows/charts.renovate.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: "Charts: Renovate"
-
-on:
- push:
- branches:
- - 'renovate/**'
- - 'update/**'
- tags-ignore:
- - '**'
-
-jobs:
- folderfix:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v2
- with:
- token: ${{ secrets.BOT_TOKEN }}
-
- - name: Configure Git
- run: |
- git config user.name "TrueCharts-Bot"
- git config user.email "bot@truecharts.org"
-
- - name: Install Helm
- uses: azure/setup-helm@v1
- with:
- version: v3.5.2
-
- - name: update folder names and dependencies for stable
- run: |
- for chart in stable/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
- helm dependency update ${chart}/${maxfolderversion}
- if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
- mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
- echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
- fi
- fi
- done
-
- - name: update folder names and dependencies for incubator
- run: |
- for chart in incubator/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
- helm dependency update ${chart}/${maxfolderversion}
- if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
- mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
- echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
- fi
- fi
- done
-
- - name: update folder names and dependencies for incubator
- run: |
- for chart in dev/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
- helm dependency update ${chart}/${maxfolderversion}
- if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
- mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
- echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
- fi
- fi
- done
-
- - name: Commit and push updated charts
- run: |
- git add --all
- git commit --all -m "Update-Folder-Names-and-Dependencies" || exit 0
- git push || exit 0
diff --git a/.github/workflows/docs.copy.yaml b/.github/workflows/docs.copy.yaml
index 2b8e67b42be..27d01a9bacd 100644
--- a/.github/workflows/docs.copy.yaml
+++ b/.github/workflows/docs.copy.yaml
@@ -61,13 +61,12 @@ jobs:
run: |
for chart in stable/*; do
if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion}"
+ echo "Processing: ${chart}"
mkdir -p docs/apps/stable/${chartname} || echo "app path already exists, continuing..."
- yes | cp -rf ${chart}/${maxfolderversion}/README.md docs/apps/stable/${chartname}/index.md || echo "readme copy failed, continuing..."
- yes | cp -rf ${chart}/${maxfolderversion}/CONFIG.md docs/apps/stable/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
- yes | cp -rf ${chart}/${maxfolderversion}/LICENSE docs/apps/stable/${chartname}/LICENSE.md || echo "license copy failed, 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
\n\n/' docs/apps/stable/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
fi
done
@@ -77,13 +76,12 @@ jobs:
run: |
for chart in incubator/*; do
if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion}"
+ echo "Processing: ${chart}"
mkdir -p docs/apps/incubator/${chartname} || echo "app path already exists, continuing..."
- yes | cp -rf ${chart}/${maxfolderversion}/README.md docs/apps/incubator/${chartname}/index.md || echo "readme copy failed, continuing..."
- yes | cp -rf ${chart}/${maxfolderversion}/CONFIG.md docs/apps/incubator/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
- yes | cp -rf ${chart}/${maxfolderversion}/LICENSE docs/apps/incubator/${chartname}/LICENSE.md || echo "license copy failed, 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
\n\n/' docs/apps/incubator/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
fi
done
diff --git a/.test/jackett/Chart.yaml b/.test/jackett/Chart.yaml
deleted file mode 100644
index d2dfd6dde9a..00000000000
--- a/.test/jackett/Chart.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-apiVersion: v2
-kubeVersion: ">=1.16.0-0"
-name: jackett
-version: 3.1.7
-upstream_version: 7.0.1
-appVersion: "auto"
-description: API Support for your favorite torrent trackers.
-type: application
-deprecated: false
-home: https://github.com/truecharts/apps/tree/master/stable/jackett
-icon: https://truecharts.org/_static/img/jackett-icon.png
-keywords:
- - jackett
- - torrent
- - usenet
-sources:
- - https://github.com/truecharts/apps/tree/master/stable/jackett
- - https://github.com/k8s-at-home/charts/tree/master/charts/jackett
- - https://github.com/Jackett/Jackett
- - https://hub.docker.com/r/linuxserver/jackett
-dependencies:
- - name: common
- repository: https://truecharts.org/
- version: 3.5.5
- # condition:
-maintainers:
- - name: TrueCharts
- email: info@truecharts.org
- url: truecharts.org
- - name: Ornias1993
- email: kjeld@schouten-lebbing.nl
- url: truecharts.org
-# annotations:
diff --git a/.test/jackett/SCALE/ix_values.yaml b/.test/jackett/SCALE/ix_values.yaml
deleted file mode 100644
index f7783217d1e..00000000000
--- a/.test/jackett/SCALE/ix_values.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-# This file contains Values.yaml content that gets added to the output of questions.yaml
-# It's ONLY meant for content that the user is NOT expected to change.
-# Example: Everything under "image" is not included in questions.yaml but is included here.
-##
-
-image:
- repository: ghcr.io/truecharts/jackett
- pullPolicy: IfNotPresent
- tag: v0.17.1006
-
-##
-# Most other defaults are set in questions.yaml
-# For other options please refer to the wiki, default_values.yaml or the common library chart
-##
diff --git a/.tools/fixfolders.sh b/.tools/fixfolders.sh
deleted file mode 100755
index 641ee15cda9..00000000000
--- a/.tools/fixfolders.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-for chart in incubator/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
- helm dependency update --skip-refresh ${chart}/${maxfolderversion}
- if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
- mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
- echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
- fi
- fi
-done
-
-
-for chart in stable/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
- helm dependency update --skip-refresh ${chart}/${maxfolderversion}
- if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
- mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
- echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
- fi
- fi
-done
-
-
-for chart in dev/*; do
- if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
- chartname=$(basename ${chart})
- echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
- helm dependency update --skip-refresh ${chart}/${maxfolderversion}
- if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
- mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
- echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
- fi
- fi
-done
diff --git a/.tools/gen-helm-docs.sh b/.tools/gen-helm-docs.sh
index 4976c6294c1..4203abc7624 100755
--- a/.tools/gen-helm-docs.sh
+++ b/.tools/gen-helm-docs.sh
@@ -16,56 +16,41 @@ repository=$(git rev-parse --show-toplevel)
# Templates to copy into each chart directory
readme_template="${repository}/.tools/templates/docs/README.md.gotmpl"
config_template="${repository}/.tools/templates/docs/CONFIG.md.gotmpl"
-app_readme_template="${repository}/.tools/templates/docs/app-readme.md.gotmpl"
-
root="${repository}"
for chart in stable/*; do
if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+ maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
chartname=$(basename ${chart})
- echo "-] Copying templates to ${repository}/${chart}/${maxfolderversion}"
+ 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}/${maxfolderversion}"
+ --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}/${maxfolderversion}"
- helm-docs \
- --ignore-file=".helmdocsignore" \
- --output-file="app-readme.md" \
- --template-files="${repository}/.tools/templates/docs/app-readme.md.gotmpl" \
- --chart-search-root="${chart}/${maxfolderversion}"
-
+ --chart-search-root="${chart}"
fi
done
for chart in incubator/*; do
if [ -d "${chart}" ]; then
- maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
- maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+ maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
chartname=$(basename ${chart})
- echo "-] Copying templates to ${repository}/${chart}/${maxfolderversion}"
+ 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}/${maxfolderversion}"
+ --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}/${maxfolderversion}"
- helm-docs \
- --ignore-file=".helmdocsignore" \
- --output-file="app-readme.md" \
- --template-files="${repository}/.tools/templates/docs/app-readme.md.gotmpl" \
- --chart-search-root="${chart}/${maxfolderversion}"
+ --chart-search-root="${chart}"
fi
done
diff --git a/.tools/templates/docs/app-readme.md.gotmpl b/.tools/templates/docs/app-readme.md.gotmpl
deleted file mode 100644
index 72c5e171f82..00000000000
--- a/.tools/templates/docs/app-readme.md.gotmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{- define "custom.notes" -}}
-This App is supplied by TrueCharts, for more information please visit https://truecharts.org
-{{- end -}}
-{{ template "chart.description" . }}
-{{ template "custom.notes" . }}
diff --git a/.tools/templates/app/app-readme.md b/dev/.gitkeep
similarity index 100%
rename from .tools/templates/app/app-readme.md
rename to dev/.gitkeep
diff --git a/dev/placeholder/6.6.6/Chart.yaml b/dev/placeholder/6.6.6/Chart.yaml
deleted file mode 100644
index 5d9c293897b..00000000000
--- a/dev/placeholder/6.6.6/Chart.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v2
-kubeVersion: ">=1.16.0-0"
-name: placeholder
-version: 6.6.6
-upstream_version: 6.6.6
-appVersion: "placeholder"
-description: THIS IS A PLACEHOLDER AND SHOULD NOT BE INSTALLED
-type: application
-deprecated: false
-home: https://github.com/truecharts/apps/tree/master/stable/jackett
-icon: https://truecharts.org/_static/img/jackett-icon.png
-keywords:
-sources:
-dependencies:
-maintainers:
- - name: TrueCharts
- email: info@truecharts.org
- url: truecharts.org
-# annotations:
diff --git a/dev/placeholder/6.6.6/README.md b/dev/placeholder/6.6.6/README.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/placeholder/6.6.6/app-readme.md b/dev/placeholder/6.6.6/app-readme.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/placeholder/6.6.6/ix_values.yaml b/dev/placeholder/6.6.6/ix_values.yaml
deleted file mode 100644
index d877036faa4..00000000000
--- a/dev/placeholder/6.6.6/ix_values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# No defaults
diff --git a/dev/placeholder/6.6.6/questions.yaml b/dev/placeholder/6.6.6/questions.yaml
deleted file mode 100644
index 43707ab50db..00000000000
--- a/dev/placeholder/6.6.6/questions.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-groups:
- - name: "Container Image"
- description: "Image to be used for container"
-
-questions: []
diff --git a/dev/placeholder/6.6.6/templates/placeholder.yaml b/dev/placeholder/6.6.6/templates/placeholder.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/placeholder/6.6.6/test_values.yaml b/dev/placeholder/6.6.6/test_values.yaml
deleted file mode 100644
index d877036faa4..00000000000
--- a/dev/placeholder/6.6.6/test_values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# No defaults
diff --git a/dev/placeholder/6.6.6/values.yaml b/dev/placeholder/6.6.6/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/dev/placeholder/6.6.6/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/dev/placeholder/item.yaml b/dev/placeholder/item.yaml
deleted file mode 100644
index 7ecde2a6c6c..00000000000
--- a/dev/placeholder/item.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-categories:
- - placeholder
-icon_url: https://truecharts.org/_static/img/jackett-icon.png
diff --git a/docs/manual/adding-truecharts.md b/docs/manual/adding-truecharts.md
index c4b566eba54..cc0f9c1b4ab 100644
--- a/docs/manual/adding-truecharts.md
+++ b/docs/manual/adding-truecharts.md
@@ -16,11 +16,11 @@ Adding the TrueCharts Community App Catalog is relatively straight forwards.
Name: `truecharts`
-Repository: `https://github.com/truecharts/apps`
+Repository: `https://github.com/truecharts/catalog`
Preferred Trains: `stable` (and optionally: `incubator`)
-Branch: `master`
+Branch: `main`
##### Difference between Stable and Incubator
diff --git a/features_capability.json b/features_capability.json
deleted file mode 100644
index 14b386c739d..00000000000
--- a/features_capability.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "normalize/interfaceConfiguration": {
- "stable": {"min": "20.12-ALPHA"},
- "nightlies": {"min": "20.10-MASTER-somever"}
- },
- "normalize/ixVolume": {
- "stable": {"min": "20.12-ALPHA"},
- "nightlies": {"min": "20.10-MASTER-somever"}
- },
- "definitions/interface": {
- "stable": {"min": "20.12-ALPHA"},
- "nightlies": {"min": "20.10-MASTER-somever"}
- },
- "definitions/gpuConfiguration": {
- "stable": {"min": "20.12-ALPHA"},
- "nightlies": {"min": "20.10-MASTER-somever"}
- },
- "definitions/timezone": {
- "stable": {"min": "20.12-ALPHA"},
- "nightlies": {"min": "20.12-MASTER"}
- },
- "definitions/nodeIP": {
- "stable": {"min": "20.12-ALPHA"},
- "nightlies": {"min": "20.12-MASTER"}
- },
- "definitions/certificate": {
- "stable": {"min": "21.04-ALPHA"},
- "nightlies": {"min": "21.02-MASTER"}
- },
- "definitions/certificateAuthority": {
- "stable": {"min": "21.04-ALPHA"},
- "nightlies": {"min": "21.02-MASTER"}
- },
- "validations/containerImage": {
- "stable": {"min": "21.06-BETA"},
- "nightlies": {"min": "21.04-MASTER"}
- },
- "validations/nodePort": {
- "stable": {"min": "21.04-ALPHA"},
- "nightlies": {"min": "21.04-MASTER"}
- }
-}
diff --git a/incubator/appdaemon/0.1.3/Chart.lock b/incubator/appdaemon/0.1.3/Chart.lock
deleted file mode 100644
index 8781d731ec1..00000000000
--- a/incubator/appdaemon/0.1.3/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:33.495095083Z"
diff --git a/incubator/appdaemon/0.1.3/charts/common-3.5.5.tgz b/incubator/appdaemon/0.1.3/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/appdaemon/0.1.3/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/appdaemon/0.1.3/values.yaml b/incubator/appdaemon/0.1.3/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/appdaemon/0.1.3/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/.test/jackett/CONFIG.md b/incubator/appdaemon/CONFIG.md
similarity index 100%
rename from .test/jackett/CONFIG.md
rename to incubator/appdaemon/CONFIG.md
diff --git a/incubator/appdaemon/0.1.3/Chart.yaml b/incubator/appdaemon/Chart.yaml
similarity index 100%
rename from incubator/appdaemon/0.1.3/Chart.yaml
rename to incubator/appdaemon/Chart.yaml
diff --git a/incubator/appdaemon/0.1.3/README.md b/incubator/appdaemon/README.md
similarity index 100%
rename from incubator/appdaemon/0.1.3/README.md
rename to incubator/appdaemon/README.md
diff --git a/incubator/appdaemon/item.yaml b/incubator/appdaemon/SCALE/item.yaml
similarity index 100%
rename from incubator/appdaemon/item.yaml
rename to incubator/appdaemon/SCALE/item.yaml
diff --git a/incubator/appdaemon/0.1.3/ix_values.yaml b/incubator/appdaemon/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/appdaemon/0.1.3/ix_values.yaml
rename to incubator/appdaemon/SCALE/ix_values.yaml
diff --git a/incubator/appdaemon/0.1.3/questions.yaml b/incubator/appdaemon/SCALE/questions.yaml
similarity index 100%
rename from incubator/appdaemon/0.1.3/questions.yaml
rename to incubator/appdaemon/SCALE/questions.yaml
diff --git a/incubator/appdaemon/0.1.3/app-readme.md b/incubator/appdaemon/app-readme.md
similarity index 100%
rename from incubator/appdaemon/0.1.3/app-readme.md
rename to incubator/appdaemon/app-readme.md
diff --git a/.test/jackett/templates/common.yaml b/incubator/appdaemon/templates/common.yaml
similarity index 100%
rename from .test/jackett/templates/common.yaml
rename to incubator/appdaemon/templates/common.yaml
diff --git a/incubator/appdaemon/0.1.3/test_values.yaml b/incubator/appdaemon/values.yaml
similarity index 100%
rename from incubator/appdaemon/0.1.3/test_values.yaml
rename to incubator/appdaemon/values.yaml
diff --git a/.test/jackett/.helmignore b/incubator/bazarr/.helmignore
similarity index 100%
rename from .test/jackett/.helmignore
rename to incubator/bazarr/.helmignore
diff --git a/incubator/bazarr/3.1.5/Chart.lock b/incubator/bazarr/3.1.5/Chart.lock
deleted file mode 100644
index f7f9a0738ff..00000000000
--- a/incubator/bazarr/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:30.220580851Z"
diff --git a/incubator/bazarr/3.1.5/charts/common-3.5.5.tgz b/incubator/bazarr/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/bazarr/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/bazarr/3.1.5/values.yaml b/incubator/bazarr/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/bazarr/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/appdaemon/0.1.3/CONFIG.md b/incubator/bazarr/CONFIG.md
similarity index 100%
rename from incubator/appdaemon/0.1.3/CONFIG.md
rename to incubator/bazarr/CONFIG.md
diff --git a/incubator/bazarr/3.1.5/Chart.yaml b/incubator/bazarr/Chart.yaml
similarity index 100%
rename from incubator/bazarr/3.1.5/Chart.yaml
rename to incubator/bazarr/Chart.yaml
diff --git a/incubator/bazarr/3.1.5/README.md b/incubator/bazarr/README.md
similarity index 100%
rename from incubator/bazarr/3.1.5/README.md
rename to incubator/bazarr/README.md
diff --git a/incubator/bazarr/item.yaml b/incubator/bazarr/SCALE/item.yaml
similarity index 100%
rename from incubator/bazarr/item.yaml
rename to incubator/bazarr/SCALE/item.yaml
diff --git a/incubator/bazarr/3.1.5/ix_values.yaml b/incubator/bazarr/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/bazarr/3.1.5/ix_values.yaml
rename to incubator/bazarr/SCALE/ix_values.yaml
diff --git a/incubator/bazarr/3.1.5/questions.yaml b/incubator/bazarr/SCALE/questions.yaml
similarity index 100%
rename from incubator/bazarr/3.1.5/questions.yaml
rename to incubator/bazarr/SCALE/questions.yaml
diff --git a/incubator/bazarr/3.1.5/app-readme.md b/incubator/bazarr/app-readme.md
similarity index 100%
rename from incubator/bazarr/3.1.5/app-readme.md
rename to incubator/bazarr/app-readme.md
diff --git a/incubator/appdaemon/0.1.3/templates/common.yaml b/incubator/bazarr/templates/common.yaml
similarity index 100%
rename from incubator/appdaemon/0.1.3/templates/common.yaml
rename to incubator/bazarr/templates/common.yaml
diff --git a/incubator/bazarr/3.1.5/test_values.yaml b/incubator/bazarr/values.yaml
similarity index 100%
rename from incubator/bazarr/3.1.5/test_values.yaml
rename to incubator/bazarr/values.yaml
diff --git a/dev/placeholder/6.6.6/.helmignore b/incubator/calibre-web/.helmignore
similarity index 100%
rename from dev/placeholder/6.6.6/.helmignore
rename to incubator/calibre-web/.helmignore
diff --git a/incubator/calibre-web/3.1.5/Chart.lock b/incubator/calibre-web/3.1.5/Chart.lock
deleted file mode 100644
index 4ab16dddf56..00000000000
--- a/incubator/calibre-web/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:27.396045024Z"
diff --git a/incubator/calibre-web/3.1.5/charts/common-3.5.5.tgz b/incubator/calibre-web/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/calibre-web/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/calibre-web/3.1.5/values.yaml b/incubator/calibre-web/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/calibre-web/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/bazarr/3.1.5/CONFIG.md b/incubator/calibre-web/CONFIG.md
similarity index 100%
rename from incubator/bazarr/3.1.5/CONFIG.md
rename to incubator/calibre-web/CONFIG.md
diff --git a/incubator/calibre-web/3.1.5/Chart.yaml b/incubator/calibre-web/Chart.yaml
similarity index 100%
rename from incubator/calibre-web/3.1.5/Chart.yaml
rename to incubator/calibre-web/Chart.yaml
diff --git a/incubator/calibre-web/3.1.5/README.md b/incubator/calibre-web/README.md
similarity index 100%
rename from incubator/calibre-web/3.1.5/README.md
rename to incubator/calibre-web/README.md
diff --git a/incubator/calibre-web/item.yaml b/incubator/calibre-web/SCALE/item.yaml
similarity index 100%
rename from incubator/calibre-web/item.yaml
rename to incubator/calibre-web/SCALE/item.yaml
diff --git a/incubator/calibre-web/3.1.5/ix_values.yaml b/incubator/calibre-web/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/calibre-web/3.1.5/ix_values.yaml
rename to incubator/calibre-web/SCALE/ix_values.yaml
diff --git a/incubator/calibre-web/3.1.5/questions.yaml b/incubator/calibre-web/SCALE/questions.yaml
similarity index 100%
rename from incubator/calibre-web/3.1.5/questions.yaml
rename to incubator/calibre-web/SCALE/questions.yaml
diff --git a/incubator/calibre-web/3.1.5/app-readme.md b/incubator/calibre-web/app-readme.md
similarity index 100%
rename from incubator/calibre-web/3.1.5/app-readme.md
rename to incubator/calibre-web/app-readme.md
diff --git a/incubator/bazarr/3.1.5/templates/common.yaml b/incubator/calibre-web/templates/common.yaml
similarity index 100%
rename from incubator/bazarr/3.1.5/templates/common.yaml
rename to incubator/calibre-web/templates/common.yaml
diff --git a/incubator/calibre-web/3.1.5/test_values.yaml b/incubator/calibre-web/values.yaml
similarity index 100%
rename from incubator/calibre-web/3.1.5/test_values.yaml
rename to incubator/calibre-web/values.yaml
diff --git a/incubator/bazarr/3.1.5/.helmignore b/incubator/deluge/.helmignore
similarity index 100%
rename from incubator/bazarr/3.1.5/.helmignore
rename to incubator/deluge/.helmignore
diff --git a/incubator/deluge/3.1.5/Chart.lock b/incubator/deluge/3.1.5/Chart.lock
deleted file mode 100644
index cfcc441e4ac..00000000000
--- a/incubator/deluge/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:24.4633977Z"
diff --git a/incubator/deluge/3.1.5/charts/common-3.5.5.tgz b/incubator/deluge/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/deluge/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/deluge/3.1.5/values.yaml b/incubator/deluge/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/deluge/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/calibre-web/3.1.5/CONFIG.md b/incubator/deluge/CONFIG.md
similarity index 100%
rename from incubator/calibre-web/3.1.5/CONFIG.md
rename to incubator/deluge/CONFIG.md
diff --git a/incubator/deluge/3.1.5/Chart.yaml b/incubator/deluge/Chart.yaml
similarity index 100%
rename from incubator/deluge/3.1.5/Chart.yaml
rename to incubator/deluge/Chart.yaml
diff --git a/incubator/deluge/3.1.5/README.md b/incubator/deluge/README.md
similarity index 100%
rename from incubator/deluge/3.1.5/README.md
rename to incubator/deluge/README.md
diff --git a/incubator/deluge/item.yaml b/incubator/deluge/SCALE/item.yaml
similarity index 100%
rename from incubator/deluge/item.yaml
rename to incubator/deluge/SCALE/item.yaml
diff --git a/incubator/deluge/3.1.5/ix_values.yaml b/incubator/deluge/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/deluge/3.1.5/ix_values.yaml
rename to incubator/deluge/SCALE/ix_values.yaml
diff --git a/incubator/deluge/3.1.5/questions.yaml b/incubator/deluge/SCALE/questions.yaml
similarity index 100%
rename from incubator/deluge/3.1.5/questions.yaml
rename to incubator/deluge/SCALE/questions.yaml
diff --git a/incubator/deluge/3.1.5/app-readme.md b/incubator/deluge/app-readme.md
similarity index 100%
rename from incubator/deluge/3.1.5/app-readme.md
rename to incubator/deluge/app-readme.md
diff --git a/incubator/calibre-web/3.1.5/templates/common.yaml b/incubator/deluge/templates/common.yaml
similarity index 100%
rename from incubator/calibre-web/3.1.5/templates/common.yaml
rename to incubator/deluge/templates/common.yaml
diff --git a/incubator/deluge/3.1.5/test_values.yaml b/incubator/deluge/values.yaml
similarity index 100%
rename from incubator/deluge/3.1.5/test_values.yaml
rename to incubator/deluge/values.yaml
diff --git a/incubator/calibre-web/3.1.5/.helmignore b/incubator/fireflyiii/.helmignore
similarity index 100%
rename from incubator/calibre-web/3.1.5/.helmignore
rename to incubator/fireflyiii/.helmignore
diff --git a/incubator/fireflyiii/1.0.1/Chart.lock b/incubator/fireflyiii/1.0.1/Chart.lock
deleted file mode 100644
index a4fb59729b7..00000000000
--- a/incubator/fireflyiii/1.0.1/Chart.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-- name: postgresql
- repository: https://charts.bitnami.com/bitnami
- version: 10.4.2
-digest: sha256:feb1c5155f10c340b5a984ce39eb7c532c938ac71287bfa65398ef3fe458c902
-generated: "2021-05-05T21:03:35.766078238Z"
diff --git a/incubator/fireflyiii/1.0.1/charts/common-3.5.5.tgz b/incubator/fireflyiii/1.0.1/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/fireflyiii/1.0.1/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/fireflyiii/1.0.1/charts/postgresql-10.4.2.tgz b/incubator/fireflyiii/1.0.1/charts/postgresql-10.4.2.tgz
deleted file mode 100644
index 1067fe424a3..00000000000
Binary files a/incubator/fireflyiii/1.0.1/charts/postgresql-10.4.2.tgz and /dev/null differ
diff --git a/incubator/fireflyiii/1.0.1/values.yaml b/incubator/fireflyiii/1.0.1/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/fireflyiii/1.0.1/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/deluge/3.1.5/CONFIG.md b/incubator/fireflyiii/CONFIG.md
similarity index 100%
rename from incubator/deluge/3.1.5/CONFIG.md
rename to incubator/fireflyiii/CONFIG.md
diff --git a/incubator/fireflyiii/1.0.1/Chart.yaml b/incubator/fireflyiii/Chart.yaml
similarity index 100%
rename from incubator/fireflyiii/1.0.1/Chart.yaml
rename to incubator/fireflyiii/Chart.yaml
diff --git a/incubator/fireflyiii/1.0.1/README.md b/incubator/fireflyiii/README.md
similarity index 100%
rename from incubator/fireflyiii/1.0.1/README.md
rename to incubator/fireflyiii/README.md
diff --git a/incubator/fireflyiii/item.yaml b/incubator/fireflyiii/SCALE/item.yaml
similarity index 100%
rename from incubator/fireflyiii/item.yaml
rename to incubator/fireflyiii/SCALE/item.yaml
diff --git a/incubator/fireflyiii/1.0.1/ix_values.yaml b/incubator/fireflyiii/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/fireflyiii/1.0.1/ix_values.yaml
rename to incubator/fireflyiii/SCALE/ix_values.yaml
diff --git a/incubator/fireflyiii/1.0.1/questions.yaml b/incubator/fireflyiii/SCALE/questions.yaml
similarity index 100%
rename from incubator/fireflyiii/1.0.1/questions.yaml
rename to incubator/fireflyiii/SCALE/questions.yaml
diff --git a/incubator/fireflyiii/1.0.1/app-readme.md b/incubator/fireflyiii/app-readme.md
similarity index 100%
rename from incubator/fireflyiii/1.0.1/app-readme.md
rename to incubator/fireflyiii/app-readme.md
diff --git a/incubator/fireflyiii/1.0.1/templates/common.yaml b/incubator/fireflyiii/templates/common.yaml
similarity index 100%
rename from incubator/fireflyiii/1.0.1/templates/common.yaml
rename to incubator/fireflyiii/templates/common.yaml
diff --git a/incubator/fireflyiii/1.0.1/templates/secrets.yaml b/incubator/fireflyiii/templates/secrets.yaml
similarity index 100%
rename from incubator/fireflyiii/1.0.1/templates/secrets.yaml
rename to incubator/fireflyiii/templates/secrets.yaml
diff --git a/incubator/fireflyiii/1.0.1/test_values.yaml b/incubator/fireflyiii/values.yaml
similarity index 100%
rename from incubator/fireflyiii/1.0.1/test_values.yaml
rename to incubator/fireflyiii/values.yaml
diff --git a/incubator/freshrss/3.1.5/.helmignore b/incubator/freshrss/.helmignore
similarity index 100%
rename from incubator/freshrss/3.1.5/.helmignore
rename to incubator/freshrss/.helmignore
diff --git a/incubator/freshrss/3.1.5/Chart.lock b/incubator/freshrss/3.1.5/Chart.lock
deleted file mode 100644
index 9dc281bcd0b..00000000000
--- a/incubator/freshrss/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:21.931872165Z"
diff --git a/incubator/freshrss/3.1.5/charts/common-3.5.5.tgz b/incubator/freshrss/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/freshrss/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/freshrss/3.1.5/values.yaml b/incubator/freshrss/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/freshrss/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/fireflyiii/1.0.1/CONFIG.md b/incubator/freshrss/CONFIG.md
similarity index 100%
rename from incubator/fireflyiii/1.0.1/CONFIG.md
rename to incubator/freshrss/CONFIG.md
diff --git a/incubator/freshrss/3.1.5/Chart.yaml b/incubator/freshrss/Chart.yaml
similarity index 100%
rename from incubator/freshrss/3.1.5/Chart.yaml
rename to incubator/freshrss/Chart.yaml
diff --git a/incubator/freshrss/3.1.5/README.md b/incubator/freshrss/README.md
similarity index 100%
rename from incubator/freshrss/3.1.5/README.md
rename to incubator/freshrss/README.md
diff --git a/incubator/freshrss/item.yaml b/incubator/freshrss/SCALE/item.yaml
similarity index 100%
rename from incubator/freshrss/item.yaml
rename to incubator/freshrss/SCALE/item.yaml
diff --git a/incubator/freshrss/3.1.5/ix_values.yaml b/incubator/freshrss/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/freshrss/3.1.5/ix_values.yaml
rename to incubator/freshrss/SCALE/ix_values.yaml
diff --git a/incubator/freshrss/3.1.5/questions.yaml b/incubator/freshrss/SCALE/questions.yaml
similarity index 100%
rename from incubator/freshrss/3.1.5/questions.yaml
rename to incubator/freshrss/SCALE/questions.yaml
diff --git a/incubator/freshrss/3.1.5/app-readme.md b/incubator/freshrss/app-readme.md
similarity index 100%
rename from incubator/freshrss/3.1.5/app-readme.md
rename to incubator/freshrss/app-readme.md
diff --git a/incubator/deluge/3.1.5/templates/common.yaml b/incubator/freshrss/templates/common.yaml
similarity index 100%
rename from incubator/deluge/3.1.5/templates/common.yaml
rename to incubator/freshrss/templates/common.yaml
diff --git a/incubator/freshrss/3.1.5/test_values.yaml b/incubator/freshrss/values.yaml
similarity index 100%
rename from incubator/freshrss/3.1.5/test_values.yaml
rename to incubator/freshrss/values.yaml
diff --git a/incubator/deluge/3.1.5/.helmignore b/incubator/gaps/.helmignore
similarity index 100%
rename from incubator/deluge/3.1.5/.helmignore
rename to incubator/gaps/.helmignore
diff --git a/incubator/gaps/3.1.5/Chart.lock b/incubator/gaps/3.1.5/Chart.lock
deleted file mode 100644
index 0aa7c8eb837..00000000000
--- a/incubator/gaps/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:19.140369742Z"
diff --git a/incubator/gaps/3.1.5/charts/common-3.5.5.tgz b/incubator/gaps/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/gaps/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/gaps/3.1.5/values.yaml b/incubator/gaps/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/gaps/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/freshrss/3.1.5/CONFIG.md b/incubator/gaps/CONFIG.md
similarity index 100%
rename from incubator/freshrss/3.1.5/CONFIG.md
rename to incubator/gaps/CONFIG.md
diff --git a/incubator/gaps/3.1.5/Chart.yaml b/incubator/gaps/Chart.yaml
similarity index 100%
rename from incubator/gaps/3.1.5/Chart.yaml
rename to incubator/gaps/Chart.yaml
diff --git a/incubator/gaps/3.1.5/README.md b/incubator/gaps/README.md
similarity index 100%
rename from incubator/gaps/3.1.5/README.md
rename to incubator/gaps/README.md
diff --git a/incubator/gaps/item.yaml b/incubator/gaps/SCALE/item.yaml
similarity index 100%
rename from incubator/gaps/item.yaml
rename to incubator/gaps/SCALE/item.yaml
diff --git a/incubator/gaps/3.1.5/ix_values.yaml b/incubator/gaps/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/gaps/3.1.5/ix_values.yaml
rename to incubator/gaps/SCALE/ix_values.yaml
diff --git a/incubator/gaps/3.1.5/questions.yaml b/incubator/gaps/SCALE/questions.yaml
similarity index 100%
rename from incubator/gaps/3.1.5/questions.yaml
rename to incubator/gaps/SCALE/questions.yaml
diff --git a/incubator/gaps/3.1.5/app-readme.md b/incubator/gaps/app-readme.md
similarity index 100%
rename from incubator/gaps/3.1.5/app-readme.md
rename to incubator/gaps/app-readme.md
diff --git a/incubator/freshrss/3.1.5/templates/common.yaml b/incubator/gaps/templates/common.yaml
similarity index 100%
rename from incubator/freshrss/3.1.5/templates/common.yaml
rename to incubator/gaps/templates/common.yaml
diff --git a/incubator/gaps/3.1.5/test_values.yaml b/incubator/gaps/values.yaml
similarity index 100%
rename from incubator/gaps/3.1.5/test_values.yaml
rename to incubator/gaps/values.yaml
diff --git a/incubator/grocy/3.1.5/.helmignore b/incubator/grocy/.helmignore
similarity index 100%
rename from incubator/grocy/3.1.5/.helmignore
rename to incubator/grocy/.helmignore
diff --git a/incubator/grocy/3.1.5/Chart.lock b/incubator/grocy/3.1.5/Chart.lock
deleted file mode 100644
index 6429ee18112..00000000000
--- a/incubator/grocy/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:16.689609154Z"
diff --git a/incubator/grocy/3.1.5/charts/common-3.5.5.tgz b/incubator/grocy/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/grocy/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/grocy/3.1.5/values.yaml b/incubator/grocy/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/grocy/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/gaps/3.1.5/CONFIG.md b/incubator/grocy/CONFIG.md
similarity index 100%
rename from incubator/gaps/3.1.5/CONFIG.md
rename to incubator/grocy/CONFIG.md
diff --git a/incubator/grocy/3.1.5/Chart.yaml b/incubator/grocy/Chart.yaml
similarity index 100%
rename from incubator/grocy/3.1.5/Chart.yaml
rename to incubator/grocy/Chart.yaml
diff --git a/incubator/grocy/3.1.5/README.md b/incubator/grocy/README.md
similarity index 100%
rename from incubator/grocy/3.1.5/README.md
rename to incubator/grocy/README.md
diff --git a/incubator/grocy/item.yaml b/incubator/grocy/SCALE/item.yaml
similarity index 100%
rename from incubator/grocy/item.yaml
rename to incubator/grocy/SCALE/item.yaml
diff --git a/incubator/grocy/3.1.5/ix_values.yaml b/incubator/grocy/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/grocy/3.1.5/ix_values.yaml
rename to incubator/grocy/SCALE/ix_values.yaml
diff --git a/incubator/grocy/3.1.5/questions.yaml b/incubator/grocy/SCALE/questions.yaml
similarity index 100%
rename from incubator/grocy/3.1.5/questions.yaml
rename to incubator/grocy/SCALE/questions.yaml
diff --git a/incubator/grocy/3.1.5/app-readme.md b/incubator/grocy/app-readme.md
similarity index 100%
rename from incubator/grocy/3.1.5/app-readme.md
rename to incubator/grocy/app-readme.md
diff --git a/incubator/gaps/3.1.5/templates/common.yaml b/incubator/grocy/templates/common.yaml
similarity index 100%
rename from incubator/gaps/3.1.5/templates/common.yaml
rename to incubator/grocy/templates/common.yaml
diff --git a/incubator/grocy/3.1.5/test_values.yaml b/incubator/grocy/values.yaml
similarity index 100%
rename from incubator/grocy/3.1.5/test_values.yaml
rename to incubator/grocy/values.yaml
diff --git a/incubator/fireflyiii/1.0.1/.helmignore b/incubator/heimdall/.helmignore
similarity index 100%
rename from incubator/fireflyiii/1.0.1/.helmignore
rename to incubator/heimdall/.helmignore
diff --git a/incubator/heimdall/3.1.5/Chart.lock b/incubator/heimdall/3.1.5/Chart.lock
deleted file mode 100644
index ac04113b78c..00000000000
--- a/incubator/heimdall/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:13.69823338Z"
diff --git a/incubator/heimdall/3.1.5/charts/common-3.5.5.tgz b/incubator/heimdall/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/heimdall/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/heimdall/3.1.5/values.yaml b/incubator/heimdall/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/heimdall/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/grocy/3.1.5/CONFIG.md b/incubator/heimdall/CONFIG.md
similarity index 100%
rename from incubator/grocy/3.1.5/CONFIG.md
rename to incubator/heimdall/CONFIG.md
diff --git a/incubator/heimdall/3.1.5/Chart.yaml b/incubator/heimdall/Chart.yaml
similarity index 100%
rename from incubator/heimdall/3.1.5/Chart.yaml
rename to incubator/heimdall/Chart.yaml
diff --git a/incubator/heimdall/3.1.5/README.md b/incubator/heimdall/README.md
similarity index 100%
rename from incubator/heimdall/3.1.5/README.md
rename to incubator/heimdall/README.md
diff --git a/incubator/heimdall/item.yaml b/incubator/heimdall/SCALE/item.yaml
similarity index 100%
rename from incubator/heimdall/item.yaml
rename to incubator/heimdall/SCALE/item.yaml
diff --git a/incubator/heimdall/3.1.5/ix_values.yaml b/incubator/heimdall/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/heimdall/3.1.5/ix_values.yaml
rename to incubator/heimdall/SCALE/ix_values.yaml
diff --git a/incubator/heimdall/3.1.5/questions.yaml b/incubator/heimdall/SCALE/questions.yaml
similarity index 100%
rename from incubator/heimdall/3.1.5/questions.yaml
rename to incubator/heimdall/SCALE/questions.yaml
diff --git a/incubator/heimdall/3.1.5/app-readme.md b/incubator/heimdall/app-readme.md
similarity index 100%
rename from incubator/heimdall/3.1.5/app-readme.md
rename to incubator/heimdall/app-readme.md
diff --git a/incubator/grocy/3.1.5/templates/common.yaml b/incubator/heimdall/templates/common.yaml
similarity index 100%
rename from incubator/grocy/3.1.5/templates/common.yaml
rename to incubator/heimdall/templates/common.yaml
diff --git a/incubator/heimdall/3.1.5/test_values.yaml b/incubator/heimdall/values.yaml
similarity index 100%
rename from incubator/heimdall/3.1.5/test_values.yaml
rename to incubator/heimdall/values.yaml
diff --git a/incubator/gaps/3.1.5/.helmignore b/incubator/lazylibrarian/.helmignore
similarity index 100%
rename from incubator/gaps/3.1.5/.helmignore
rename to incubator/lazylibrarian/.helmignore
diff --git a/incubator/lazylibrarian/3.1.5/Chart.lock b/incubator/lazylibrarian/3.1.5/Chart.lock
deleted file mode 100644
index c3e1023af81..00000000000
--- a/incubator/lazylibrarian/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:10.092045326Z"
diff --git a/incubator/lazylibrarian/3.1.5/charts/common-3.5.5.tgz b/incubator/lazylibrarian/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/lazylibrarian/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/lazylibrarian/3.1.5/values.yaml b/incubator/lazylibrarian/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/lazylibrarian/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/heimdall/3.1.5/CONFIG.md b/incubator/lazylibrarian/CONFIG.md
similarity index 100%
rename from incubator/heimdall/3.1.5/CONFIG.md
rename to incubator/lazylibrarian/CONFIG.md
diff --git a/incubator/lazylibrarian/3.1.5/Chart.yaml b/incubator/lazylibrarian/Chart.yaml
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/Chart.yaml
rename to incubator/lazylibrarian/Chart.yaml
diff --git a/incubator/lazylibrarian/3.1.5/README.md b/incubator/lazylibrarian/README.md
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/README.md
rename to incubator/lazylibrarian/README.md
diff --git a/incubator/lazylibrarian/item.yaml b/incubator/lazylibrarian/SCALE/item.yaml
similarity index 100%
rename from incubator/lazylibrarian/item.yaml
rename to incubator/lazylibrarian/SCALE/item.yaml
diff --git a/incubator/lazylibrarian/3.1.5/ix_values.yaml b/incubator/lazylibrarian/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/ix_values.yaml
rename to incubator/lazylibrarian/SCALE/ix_values.yaml
diff --git a/incubator/lazylibrarian/3.1.5/questions.yaml b/incubator/lazylibrarian/SCALE/questions.yaml
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/questions.yaml
rename to incubator/lazylibrarian/SCALE/questions.yaml
diff --git a/incubator/lazylibrarian/3.1.5/app-readme.md b/incubator/lazylibrarian/app-readme.md
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/app-readme.md
rename to incubator/lazylibrarian/app-readme.md
diff --git a/incubator/heimdall/3.1.5/templates/common.yaml b/incubator/lazylibrarian/templates/common.yaml
similarity index 100%
rename from incubator/heimdall/3.1.5/templates/common.yaml
rename to incubator/lazylibrarian/templates/common.yaml
diff --git a/incubator/lazylibrarian/3.1.5/test_values.yaml b/incubator/lazylibrarian/values.yaml
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/test_values.yaml
rename to incubator/lazylibrarian/values.yaml
diff --git a/incubator/lychee/3.1.5/.helmignore b/incubator/lychee/.helmignore
similarity index 100%
rename from incubator/lychee/3.1.5/.helmignore
rename to incubator/lychee/.helmignore
diff --git a/incubator/lychee/3.1.5/Chart.lock b/incubator/lychee/3.1.5/Chart.lock
deleted file mode 100644
index 40d52bb0e87..00000000000
--- a/incubator/lychee/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:07.063492656Z"
diff --git a/incubator/lychee/3.1.5/charts/common-3.5.5.tgz b/incubator/lychee/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/lychee/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/lychee/3.1.5/values.yaml b/incubator/lychee/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/lychee/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/lazylibrarian/3.1.5/CONFIG.md b/incubator/lychee/CONFIG.md
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/CONFIG.md
rename to incubator/lychee/CONFIG.md
diff --git a/incubator/lychee/3.1.5/Chart.yaml b/incubator/lychee/Chart.yaml
similarity index 100%
rename from incubator/lychee/3.1.5/Chart.yaml
rename to incubator/lychee/Chart.yaml
diff --git a/incubator/lychee/3.1.5/README.md b/incubator/lychee/README.md
similarity index 100%
rename from incubator/lychee/3.1.5/README.md
rename to incubator/lychee/README.md
diff --git a/incubator/lychee/item.yaml b/incubator/lychee/SCALE/item.yaml
similarity index 100%
rename from incubator/lychee/item.yaml
rename to incubator/lychee/SCALE/item.yaml
diff --git a/incubator/lychee/3.1.5/ix_values.yaml b/incubator/lychee/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/lychee/3.1.5/ix_values.yaml
rename to incubator/lychee/SCALE/ix_values.yaml
diff --git a/incubator/lychee/3.1.5/questions.yaml b/incubator/lychee/SCALE/questions.yaml
similarity index 100%
rename from incubator/lychee/3.1.5/questions.yaml
rename to incubator/lychee/SCALE/questions.yaml
diff --git a/incubator/lychee/3.1.5/app-readme.md b/incubator/lychee/app-readme.md
similarity index 100%
rename from incubator/lychee/3.1.5/app-readme.md
rename to incubator/lychee/app-readme.md
diff --git a/incubator/lazylibrarian/3.1.5/templates/common.yaml b/incubator/lychee/templates/common.yaml
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/templates/common.yaml
rename to incubator/lychee/templates/common.yaml
diff --git a/incubator/lychee/3.1.5/test_values.yaml b/incubator/lychee/values.yaml
similarity index 100%
rename from incubator/lychee/3.1.5/test_values.yaml
rename to incubator/lychee/values.yaml
diff --git a/incubator/navidrome/3.1.5/.helmignore b/incubator/navidrome/.helmignore
similarity index 100%
rename from incubator/navidrome/3.1.5/.helmignore
rename to incubator/navidrome/.helmignore
diff --git a/incubator/navidrome/3.1.5/Chart.lock b/incubator/navidrome/3.1.5/Chart.lock
deleted file mode 100644
index ee61daed0a8..00000000000
--- a/incubator/navidrome/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:04.550438373Z"
diff --git a/incubator/navidrome/3.1.5/charts/common-3.5.5.tgz b/incubator/navidrome/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/navidrome/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/navidrome/3.1.5/values.yaml b/incubator/navidrome/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/navidrome/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/lychee/3.1.5/CONFIG.md b/incubator/navidrome/CONFIG.md
similarity index 100%
rename from incubator/lychee/3.1.5/CONFIG.md
rename to incubator/navidrome/CONFIG.md
diff --git a/incubator/navidrome/3.1.5/Chart.yaml b/incubator/navidrome/Chart.yaml
similarity index 100%
rename from incubator/navidrome/3.1.5/Chart.yaml
rename to incubator/navidrome/Chart.yaml
diff --git a/incubator/navidrome/3.1.5/README.md b/incubator/navidrome/README.md
similarity index 100%
rename from incubator/navidrome/3.1.5/README.md
rename to incubator/navidrome/README.md
diff --git a/incubator/navidrome/item.yaml b/incubator/navidrome/SCALE/item.yaml
similarity index 100%
rename from incubator/navidrome/item.yaml
rename to incubator/navidrome/SCALE/item.yaml
diff --git a/incubator/navidrome/3.1.5/ix_values.yaml b/incubator/navidrome/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/navidrome/3.1.5/ix_values.yaml
rename to incubator/navidrome/SCALE/ix_values.yaml
diff --git a/incubator/navidrome/3.1.5/questions.yaml b/incubator/navidrome/SCALE/questions.yaml
similarity index 100%
rename from incubator/navidrome/3.1.5/questions.yaml
rename to incubator/navidrome/SCALE/questions.yaml
diff --git a/incubator/navidrome/3.1.5/app-readme.md b/incubator/navidrome/app-readme.md
similarity index 100%
rename from incubator/navidrome/3.1.5/app-readme.md
rename to incubator/navidrome/app-readme.md
diff --git a/incubator/lychee/3.1.5/templates/common.yaml b/incubator/navidrome/templates/common.yaml
similarity index 100%
rename from incubator/lychee/3.1.5/templates/common.yaml
rename to incubator/navidrome/templates/common.yaml
diff --git a/incubator/navidrome/3.1.5/test_values.yaml b/incubator/navidrome/values.yaml
similarity index 100%
rename from incubator/navidrome/3.1.5/test_values.yaml
rename to incubator/navidrome/values.yaml
diff --git a/incubator/heimdall/3.1.5/.helmignore b/incubator/node-red/.helmignore
similarity index 100%
rename from incubator/heimdall/3.1.5/.helmignore
rename to incubator/node-red/.helmignore
diff --git a/incubator/node-red/3.1.5/Chart.lock b/incubator/node-red/3.1.5/Chart.lock
deleted file mode 100644
index f0939bdba65..00000000000
--- a/incubator/node-red/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:01.620911017Z"
diff --git a/incubator/node-red/3.1.5/charts/common-3.5.5.tgz b/incubator/node-red/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/node-red/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/node-red/3.1.5/values.yaml b/incubator/node-red/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/node-red/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/navidrome/3.1.5/CONFIG.md b/incubator/node-red/CONFIG.md
similarity index 100%
rename from incubator/navidrome/3.1.5/CONFIG.md
rename to incubator/node-red/CONFIG.md
diff --git a/incubator/node-red/3.1.5/Chart.yaml b/incubator/node-red/Chart.yaml
similarity index 100%
rename from incubator/node-red/3.1.5/Chart.yaml
rename to incubator/node-red/Chart.yaml
diff --git a/incubator/node-red/3.1.5/README.md b/incubator/node-red/README.md
similarity index 100%
rename from incubator/node-red/3.1.5/README.md
rename to incubator/node-red/README.md
diff --git a/incubator/node-red/item.yaml b/incubator/node-red/SCALE/item.yaml
similarity index 100%
rename from incubator/node-red/item.yaml
rename to incubator/node-red/SCALE/item.yaml
diff --git a/incubator/node-red/3.1.5/ix_values.yaml b/incubator/node-red/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/node-red/3.1.5/ix_values.yaml
rename to incubator/node-red/SCALE/ix_values.yaml
diff --git a/incubator/node-red/3.1.5/questions.yaml b/incubator/node-red/SCALE/questions.yaml
similarity index 100%
rename from incubator/node-red/3.1.5/questions.yaml
rename to incubator/node-red/SCALE/questions.yaml
diff --git a/incubator/node-red/3.1.5/app-readme.md b/incubator/node-red/app-readme.md
similarity index 100%
rename from incubator/node-red/3.1.5/app-readme.md
rename to incubator/node-red/app-readme.md
diff --git a/incubator/navidrome/3.1.5/templates/common.yaml b/incubator/node-red/templates/common.yaml
similarity index 100%
rename from incubator/navidrome/3.1.5/templates/common.yaml
rename to incubator/node-red/templates/common.yaml
diff --git a/incubator/node-red/3.1.5/test_values.yaml b/incubator/node-red/values.yaml
similarity index 100%
rename from incubator/node-red/3.1.5/test_values.yaml
rename to incubator/node-red/values.yaml
diff --git a/incubator/nzbget/3.1.5/.helmignore b/incubator/nzbget/.helmignore
similarity index 100%
rename from incubator/nzbget/3.1.5/.helmignore
rename to incubator/nzbget/.helmignore
diff --git a/incubator/nzbget/3.1.5/Chart.lock b/incubator/nzbget/3.1.5/Chart.lock
deleted file mode 100644
index 0dc01575e1e..00000000000
--- a/incubator/nzbget/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:58.320832927Z"
diff --git a/incubator/nzbget/3.1.5/charts/common-3.5.5.tgz b/incubator/nzbget/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/nzbget/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/nzbget/3.1.5/values.yaml b/incubator/nzbget/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/nzbget/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/node-red/3.1.5/CONFIG.md b/incubator/nzbget/CONFIG.md
similarity index 100%
rename from incubator/node-red/3.1.5/CONFIG.md
rename to incubator/nzbget/CONFIG.md
diff --git a/incubator/nzbget/3.1.5/Chart.yaml b/incubator/nzbget/Chart.yaml
similarity index 100%
rename from incubator/nzbget/3.1.5/Chart.yaml
rename to incubator/nzbget/Chart.yaml
diff --git a/incubator/nzbget/3.1.5/README.md b/incubator/nzbget/README.md
similarity index 100%
rename from incubator/nzbget/3.1.5/README.md
rename to incubator/nzbget/README.md
diff --git a/incubator/nzbget/item.yaml b/incubator/nzbget/SCALE/item.yaml
similarity index 100%
rename from incubator/nzbget/item.yaml
rename to incubator/nzbget/SCALE/item.yaml
diff --git a/incubator/nzbget/3.1.5/ix_values.yaml b/incubator/nzbget/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/nzbget/3.1.5/ix_values.yaml
rename to incubator/nzbget/SCALE/ix_values.yaml
diff --git a/incubator/nzbget/3.1.5/questions.yaml b/incubator/nzbget/SCALE/questions.yaml
similarity index 100%
rename from incubator/nzbget/3.1.5/questions.yaml
rename to incubator/nzbget/SCALE/questions.yaml
diff --git a/incubator/nzbget/3.1.5/app-readme.md b/incubator/nzbget/app-readme.md
similarity index 100%
rename from incubator/nzbget/3.1.5/app-readme.md
rename to incubator/nzbget/app-readme.md
diff --git a/incubator/node-red/3.1.5/templates/common.yaml b/incubator/nzbget/templates/common.yaml
similarity index 100%
rename from incubator/node-red/3.1.5/templates/common.yaml
rename to incubator/nzbget/templates/common.yaml
diff --git a/incubator/nzbget/3.1.5/test_values.yaml b/incubator/nzbget/values.yaml
similarity index 100%
rename from incubator/nzbget/3.1.5/test_values.yaml
rename to incubator/nzbget/values.yaml
diff --git a/incubator/nzbhydra/3.1.5/.helmignore b/incubator/nzbhydra/.helmignore
similarity index 100%
rename from incubator/nzbhydra/3.1.5/.helmignore
rename to incubator/nzbhydra/.helmignore
diff --git a/incubator/nzbhydra/3.1.5/Chart.lock b/incubator/nzbhydra/3.1.5/Chart.lock
deleted file mode 100644
index 5cb976e1c3a..00000000000
--- a/incubator/nzbhydra/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:55.584099711Z"
diff --git a/incubator/nzbhydra/3.1.5/charts/common-3.5.5.tgz b/incubator/nzbhydra/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/nzbhydra/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/nzbhydra/3.1.5/values.yaml b/incubator/nzbhydra/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/nzbhydra/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/nzbget/3.1.5/CONFIG.md b/incubator/nzbhydra/CONFIG.md
similarity index 100%
rename from incubator/nzbget/3.1.5/CONFIG.md
rename to incubator/nzbhydra/CONFIG.md
diff --git a/incubator/nzbhydra/3.1.5/Chart.yaml b/incubator/nzbhydra/Chart.yaml
similarity index 100%
rename from incubator/nzbhydra/3.1.5/Chart.yaml
rename to incubator/nzbhydra/Chart.yaml
diff --git a/incubator/nzbhydra/3.1.5/README.md b/incubator/nzbhydra/README.md
similarity index 100%
rename from incubator/nzbhydra/3.1.5/README.md
rename to incubator/nzbhydra/README.md
diff --git a/incubator/nzbhydra/item.yaml b/incubator/nzbhydra/SCALE/item.yaml
similarity index 100%
rename from incubator/nzbhydra/item.yaml
rename to incubator/nzbhydra/SCALE/item.yaml
diff --git a/incubator/nzbhydra/3.1.5/ix_values.yaml b/incubator/nzbhydra/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/nzbhydra/3.1.5/ix_values.yaml
rename to incubator/nzbhydra/SCALE/ix_values.yaml
diff --git a/incubator/nzbhydra/3.1.5/questions.yaml b/incubator/nzbhydra/SCALE/questions.yaml
similarity index 100%
rename from incubator/nzbhydra/3.1.5/questions.yaml
rename to incubator/nzbhydra/SCALE/questions.yaml
diff --git a/incubator/nzbhydra/3.1.5/app-readme.md b/incubator/nzbhydra/app-readme.md
similarity index 100%
rename from incubator/nzbhydra/3.1.5/app-readme.md
rename to incubator/nzbhydra/app-readme.md
diff --git a/incubator/nzbget/3.1.5/templates/common.yaml b/incubator/nzbhydra/templates/common.yaml
similarity index 100%
rename from incubator/nzbget/3.1.5/templates/common.yaml
rename to incubator/nzbhydra/templates/common.yaml
diff --git a/incubator/nzbhydra/3.1.5/test_values.yaml b/incubator/nzbhydra/values.yaml
similarity index 100%
rename from incubator/nzbhydra/3.1.5/test_values.yaml
rename to incubator/nzbhydra/values.yaml
diff --git a/incubator/lazylibrarian/3.1.5/.helmignore b/incubator/organizr/.helmignore
similarity index 100%
rename from incubator/lazylibrarian/3.1.5/.helmignore
rename to incubator/organizr/.helmignore
diff --git a/incubator/organizr/3.1.5/Chart.lock b/incubator/organizr/3.1.5/Chart.lock
deleted file mode 100644
index cef20980461..00000000000
--- a/incubator/organizr/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:53.11868911Z"
diff --git a/incubator/organizr/3.1.5/charts/common-3.5.5.tgz b/incubator/organizr/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/organizr/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/organizr/3.1.5/values.yaml b/incubator/organizr/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/organizr/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/nzbhydra/3.1.5/CONFIG.md b/incubator/organizr/CONFIG.md
similarity index 100%
rename from incubator/nzbhydra/3.1.5/CONFIG.md
rename to incubator/organizr/CONFIG.md
diff --git a/incubator/organizr/3.1.5/Chart.yaml b/incubator/organizr/Chart.yaml
similarity index 100%
rename from incubator/organizr/3.1.5/Chart.yaml
rename to incubator/organizr/Chart.yaml
diff --git a/incubator/organizr/3.1.5/README.md b/incubator/organizr/README.md
similarity index 100%
rename from incubator/organizr/3.1.5/README.md
rename to incubator/organizr/README.md
diff --git a/incubator/organizr/item.yaml b/incubator/organizr/SCALE/item.yaml
similarity index 100%
rename from incubator/organizr/item.yaml
rename to incubator/organizr/SCALE/item.yaml
diff --git a/incubator/organizr/3.1.5/ix_values.yaml b/incubator/organizr/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/organizr/3.1.5/ix_values.yaml
rename to incubator/organizr/SCALE/ix_values.yaml
diff --git a/incubator/organizr/3.1.5/questions.yaml b/incubator/organizr/SCALE/questions.yaml
similarity index 100%
rename from incubator/organizr/3.1.5/questions.yaml
rename to incubator/organizr/SCALE/questions.yaml
diff --git a/incubator/organizr/3.1.5/app-readme.md b/incubator/organizr/app-readme.md
similarity index 100%
rename from incubator/organizr/3.1.5/app-readme.md
rename to incubator/organizr/app-readme.md
diff --git a/incubator/nzbhydra/3.1.5/templates/common.yaml b/incubator/organizr/templates/common.yaml
similarity index 100%
rename from incubator/nzbhydra/3.1.5/templates/common.yaml
rename to incubator/organizr/templates/common.yaml
diff --git a/incubator/organizr/3.1.5/test_values.yaml b/incubator/organizr/values.yaml
similarity index 100%
rename from incubator/organizr/3.1.5/test_values.yaml
rename to incubator/organizr/values.yaml
diff --git a/incubator/podgrab/1.0.3/Chart.lock b/incubator/podgrab/1.0.3/Chart.lock
deleted file mode 100644
index 8f64d508804..00000000000
--- a/incubator/podgrab/1.0.3/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:50.581623128Z"
diff --git a/incubator/podgrab/1.0.3/charts/common-3.5.5.tgz b/incubator/podgrab/1.0.3/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/podgrab/1.0.3/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/podgrab/1.0.3/values.yaml b/incubator/podgrab/1.0.3/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/podgrab/1.0.3/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/organizr/3.1.5/CONFIG.md b/incubator/podgrab/CONFIG.md
similarity index 100%
rename from incubator/organizr/3.1.5/CONFIG.md
rename to incubator/podgrab/CONFIG.md
diff --git a/incubator/podgrab/1.0.3/Chart.yaml b/incubator/podgrab/Chart.yaml
similarity index 100%
rename from incubator/podgrab/1.0.3/Chart.yaml
rename to incubator/podgrab/Chart.yaml
diff --git a/incubator/podgrab/1.0.3/README.md b/incubator/podgrab/README.md
similarity index 100%
rename from incubator/podgrab/1.0.3/README.md
rename to incubator/podgrab/README.md
diff --git a/incubator/podgrab/item.yaml b/incubator/podgrab/SCALE/item.yaml
similarity index 100%
rename from incubator/podgrab/item.yaml
rename to incubator/podgrab/SCALE/item.yaml
diff --git a/incubator/podgrab/1.0.3/ix_values.yaml b/incubator/podgrab/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/podgrab/1.0.3/ix_values.yaml
rename to incubator/podgrab/SCALE/ix_values.yaml
diff --git a/incubator/podgrab/1.0.3/questions.yaml b/incubator/podgrab/SCALE/questions.yaml
similarity index 100%
rename from incubator/podgrab/1.0.3/questions.yaml
rename to incubator/podgrab/SCALE/questions.yaml
diff --git a/incubator/podgrab/1.0.3/app-readme.md b/incubator/podgrab/app-readme.md
similarity index 100%
rename from incubator/podgrab/1.0.3/app-readme.md
rename to incubator/podgrab/app-readme.md
diff --git a/incubator/organizr/3.1.5/templates/common.yaml b/incubator/podgrab/templates/common.yaml
similarity index 100%
rename from incubator/organizr/3.1.5/templates/common.yaml
rename to incubator/podgrab/templates/common.yaml
diff --git a/incubator/podgrab/1.0.3/test_values.yaml b/incubator/podgrab/values.yaml
similarity index 100%
rename from incubator/podgrab/1.0.3/test_values.yaml
rename to incubator/podgrab/values.yaml
diff --git a/incubator/qbittorrent/3.1.5/.helmignore b/incubator/qbittorrent/.helmignore
similarity index 100%
rename from incubator/qbittorrent/3.1.5/.helmignore
rename to incubator/qbittorrent/.helmignore
diff --git a/incubator/qbittorrent/3.1.5/Chart.lock b/incubator/qbittorrent/3.1.5/Chart.lock
deleted file mode 100644
index 128bd06b787..00000000000
--- a/incubator/qbittorrent/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:47.925655046Z"
diff --git a/incubator/qbittorrent/3.1.5/charts/common-3.5.5.tgz b/incubator/qbittorrent/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/qbittorrent/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/qbittorrent/3.1.5/values.yaml b/incubator/qbittorrent/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/qbittorrent/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/podgrab/1.0.3/CONFIG.md b/incubator/qbittorrent/CONFIG.md
similarity index 100%
rename from incubator/podgrab/1.0.3/CONFIG.md
rename to incubator/qbittorrent/CONFIG.md
diff --git a/incubator/qbittorrent/3.1.5/Chart.yaml b/incubator/qbittorrent/Chart.yaml
similarity index 100%
rename from incubator/qbittorrent/3.1.5/Chart.yaml
rename to incubator/qbittorrent/Chart.yaml
diff --git a/incubator/qbittorrent/3.1.5/README.md b/incubator/qbittorrent/README.md
similarity index 100%
rename from incubator/qbittorrent/3.1.5/README.md
rename to incubator/qbittorrent/README.md
diff --git a/incubator/qbittorrent/item.yaml b/incubator/qbittorrent/SCALE/item.yaml
similarity index 100%
rename from incubator/qbittorrent/item.yaml
rename to incubator/qbittorrent/SCALE/item.yaml
diff --git a/incubator/qbittorrent/3.1.5/ix_values.yaml b/incubator/qbittorrent/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/qbittorrent/3.1.5/ix_values.yaml
rename to incubator/qbittorrent/SCALE/ix_values.yaml
diff --git a/incubator/qbittorrent/3.1.5/questions.yaml b/incubator/qbittorrent/SCALE/questions.yaml
similarity index 100%
rename from incubator/qbittorrent/3.1.5/questions.yaml
rename to incubator/qbittorrent/SCALE/questions.yaml
diff --git a/incubator/qbittorrent/3.1.5/app-readme.md b/incubator/qbittorrent/app-readme.md
similarity index 100%
rename from incubator/qbittorrent/3.1.5/app-readme.md
rename to incubator/qbittorrent/app-readme.md
diff --git a/incubator/podgrab/1.0.3/templates/common.yaml b/incubator/qbittorrent/templates/common.yaml
similarity index 100%
rename from incubator/podgrab/1.0.3/templates/common.yaml
rename to incubator/qbittorrent/templates/common.yaml
diff --git a/incubator/qbittorrent/3.1.5/templates/configmap.yaml b/incubator/qbittorrent/templates/configmap.yaml
similarity index 100%
rename from incubator/qbittorrent/3.1.5/templates/configmap.yaml
rename to incubator/qbittorrent/templates/configmap.yaml
diff --git a/incubator/qbittorrent/3.1.5/test_values.yaml b/incubator/qbittorrent/values.yaml
similarity index 100%
rename from incubator/qbittorrent/3.1.5/test_values.yaml
rename to incubator/qbittorrent/values.yaml
diff --git a/incubator/readarr/3.1.5/.helmignore b/incubator/readarr/.helmignore
similarity index 100%
rename from incubator/readarr/3.1.5/.helmignore
rename to incubator/readarr/.helmignore
diff --git a/incubator/readarr/3.1.5/Chart.lock b/incubator/readarr/3.1.5/Chart.lock
deleted file mode 100644
index 4803e73993a..00000000000
--- a/incubator/readarr/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:44.508795214Z"
diff --git a/incubator/readarr/3.1.5/charts/common-3.5.5.tgz b/incubator/readarr/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/readarr/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/readarr/3.1.5/values.yaml b/incubator/readarr/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/readarr/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/qbittorrent/3.1.5/CONFIG.md b/incubator/readarr/CONFIG.md
similarity index 100%
rename from incubator/qbittorrent/3.1.5/CONFIG.md
rename to incubator/readarr/CONFIG.md
diff --git a/incubator/readarr/3.1.5/Chart.yaml b/incubator/readarr/Chart.yaml
similarity index 100%
rename from incubator/readarr/3.1.5/Chart.yaml
rename to incubator/readarr/Chart.yaml
diff --git a/incubator/readarr/3.1.5/README.md b/incubator/readarr/README.md
similarity index 100%
rename from incubator/readarr/3.1.5/README.md
rename to incubator/readarr/README.md
diff --git a/incubator/readarr/item.yaml b/incubator/readarr/SCALE/item.yaml
similarity index 100%
rename from incubator/readarr/item.yaml
rename to incubator/readarr/SCALE/item.yaml
diff --git a/incubator/readarr/3.1.5/ix_values.yaml b/incubator/readarr/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/readarr/3.1.5/ix_values.yaml
rename to incubator/readarr/SCALE/ix_values.yaml
diff --git a/incubator/readarr/3.1.5/questions.yaml b/incubator/readarr/SCALE/questions.yaml
similarity index 100%
rename from incubator/readarr/3.1.5/questions.yaml
rename to incubator/readarr/SCALE/questions.yaml
diff --git a/incubator/readarr/3.1.5/app-readme.md b/incubator/readarr/app-readme.md
similarity index 100%
rename from incubator/readarr/3.1.5/app-readme.md
rename to incubator/readarr/app-readme.md
diff --git a/incubator/qbittorrent/3.1.5/templates/common.yaml b/incubator/readarr/templates/common.yaml
similarity index 100%
rename from incubator/qbittorrent/3.1.5/templates/common.yaml
rename to incubator/readarr/templates/common.yaml
diff --git a/incubator/readarr/3.1.5/test_values.yaml b/incubator/readarr/values.yaml
similarity index 100%
rename from incubator/readarr/3.1.5/test_values.yaml
rename to incubator/readarr/values.yaml
diff --git a/incubator/sabnzbd/3.1.5/.helmignore b/incubator/sabnzbd/.helmignore
similarity index 100%
rename from incubator/sabnzbd/3.1.5/.helmignore
rename to incubator/sabnzbd/.helmignore
diff --git a/incubator/sabnzbd/3.1.5/Chart.lock b/incubator/sabnzbd/3.1.5/Chart.lock
deleted file mode 100644
index a73cf6bf5b6..00000000000
--- a/incubator/sabnzbd/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:41.986331296Z"
diff --git a/incubator/sabnzbd/3.1.5/charts/common-3.5.5.tgz b/incubator/sabnzbd/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/sabnzbd/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/sabnzbd/3.1.5/values.yaml b/incubator/sabnzbd/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/sabnzbd/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/readarr/3.1.5/CONFIG.md b/incubator/sabnzbd/CONFIG.md
similarity index 100%
rename from incubator/readarr/3.1.5/CONFIG.md
rename to incubator/sabnzbd/CONFIG.md
diff --git a/incubator/sabnzbd/3.1.5/Chart.yaml b/incubator/sabnzbd/Chart.yaml
similarity index 100%
rename from incubator/sabnzbd/3.1.5/Chart.yaml
rename to incubator/sabnzbd/Chart.yaml
diff --git a/incubator/sabnzbd/3.1.5/README.md b/incubator/sabnzbd/README.md
similarity index 100%
rename from incubator/sabnzbd/3.1.5/README.md
rename to incubator/sabnzbd/README.md
diff --git a/incubator/sabnzbd/item.yaml b/incubator/sabnzbd/SCALE/item.yaml
similarity index 100%
rename from incubator/sabnzbd/item.yaml
rename to incubator/sabnzbd/SCALE/item.yaml
diff --git a/incubator/sabnzbd/3.1.5/ix_values.yaml b/incubator/sabnzbd/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/sabnzbd/3.1.5/ix_values.yaml
rename to incubator/sabnzbd/SCALE/ix_values.yaml
diff --git a/incubator/sabnzbd/3.1.5/questions.yaml b/incubator/sabnzbd/SCALE/questions.yaml
similarity index 100%
rename from incubator/sabnzbd/3.1.5/questions.yaml
rename to incubator/sabnzbd/SCALE/questions.yaml
diff --git a/incubator/sabnzbd/3.1.5/app-readme.md b/incubator/sabnzbd/app-readme.md
similarity index 100%
rename from incubator/sabnzbd/3.1.5/app-readme.md
rename to incubator/sabnzbd/app-readme.md
diff --git a/incubator/readarr/3.1.5/templates/common.yaml b/incubator/sabnzbd/templates/common.yaml
similarity index 100%
rename from incubator/readarr/3.1.5/templates/common.yaml
rename to incubator/sabnzbd/templates/common.yaml
diff --git a/incubator/sabnzbd/3.1.5/test_values.yaml b/incubator/sabnzbd/values.yaml
similarity index 100%
rename from incubator/sabnzbd/3.1.5/test_values.yaml
rename to incubator/sabnzbd/values.yaml
diff --git a/incubator/node-red/3.1.5/.helmignore b/incubator/truecommand/.helmignore
similarity index 100%
rename from incubator/node-red/3.1.5/.helmignore
rename to incubator/truecommand/.helmignore
diff --git a/incubator/truecommand/3.1.5/Chart.lock b/incubator/truecommand/3.1.5/Chart.lock
deleted file mode 100644
index 12d8a25074e..00000000000
--- a/incubator/truecommand/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:38.998873863Z"
diff --git a/incubator/truecommand/3.1.5/charts/common-3.5.5.tgz b/incubator/truecommand/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/truecommand/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/truecommand/3.1.5/values.yaml b/incubator/truecommand/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/truecommand/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/sabnzbd/3.1.5/CONFIG.md b/incubator/truecommand/CONFIG.md
similarity index 100%
rename from incubator/sabnzbd/3.1.5/CONFIG.md
rename to incubator/truecommand/CONFIG.md
diff --git a/incubator/truecommand/3.1.5/Chart.yaml b/incubator/truecommand/Chart.yaml
similarity index 100%
rename from incubator/truecommand/3.1.5/Chart.yaml
rename to incubator/truecommand/Chart.yaml
diff --git a/incubator/truecommand/3.1.5/README.md b/incubator/truecommand/README.md
similarity index 100%
rename from incubator/truecommand/3.1.5/README.md
rename to incubator/truecommand/README.md
diff --git a/incubator/truecommand/item.yaml b/incubator/truecommand/SCALE/item.yaml
similarity index 100%
rename from incubator/truecommand/item.yaml
rename to incubator/truecommand/SCALE/item.yaml
diff --git a/incubator/truecommand/3.1.5/ix_values.yaml b/incubator/truecommand/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/truecommand/3.1.5/ix_values.yaml
rename to incubator/truecommand/SCALE/ix_values.yaml
diff --git a/incubator/truecommand/3.1.5/questions.yaml b/incubator/truecommand/SCALE/questions.yaml
similarity index 100%
rename from incubator/truecommand/3.1.5/questions.yaml
rename to incubator/truecommand/SCALE/questions.yaml
diff --git a/incubator/truecommand/3.1.5/app-readme.md b/incubator/truecommand/app-readme.md
similarity index 100%
rename from incubator/truecommand/3.1.5/app-readme.md
rename to incubator/truecommand/app-readme.md
diff --git a/incubator/sabnzbd/3.1.5/templates/common.yaml b/incubator/truecommand/templates/common.yaml
similarity index 100%
rename from incubator/sabnzbd/3.1.5/templates/common.yaml
rename to incubator/truecommand/templates/common.yaml
diff --git a/incubator/truecommand/3.1.5/test_values.yaml b/incubator/truecommand/values.yaml
similarity index 100%
rename from incubator/truecommand/3.1.5/test_values.yaml
rename to incubator/truecommand/values.yaml
diff --git a/incubator/tvheadend/4.1.5/.helmignore b/incubator/tvheadend/.helmignore
similarity index 100%
rename from incubator/tvheadend/4.1.5/.helmignore
rename to incubator/tvheadend/.helmignore
diff --git a/incubator/tvheadend/4.1.5/Chart.lock b/incubator/tvheadend/4.1.5/Chart.lock
deleted file mode 100644
index 207b4bc7c49..00000000000
--- a/incubator/tvheadend/4.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:36.301073302Z"
diff --git a/incubator/tvheadend/4.1.5/charts/common-3.5.5.tgz b/incubator/tvheadend/4.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/tvheadend/4.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/tvheadend/4.1.5/values.yaml b/incubator/tvheadend/4.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/tvheadend/4.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/truecommand/3.1.5/CONFIG.md b/incubator/tvheadend/CONFIG.md
similarity index 100%
rename from incubator/truecommand/3.1.5/CONFIG.md
rename to incubator/tvheadend/CONFIG.md
diff --git a/incubator/tvheadend/4.1.5/Chart.yaml b/incubator/tvheadend/Chart.yaml
similarity index 100%
rename from incubator/tvheadend/4.1.5/Chart.yaml
rename to incubator/tvheadend/Chart.yaml
diff --git a/incubator/tvheadend/4.1.5/README.md b/incubator/tvheadend/README.md
similarity index 100%
rename from incubator/tvheadend/4.1.5/README.md
rename to incubator/tvheadend/README.md
diff --git a/incubator/tvheadend/item.yaml b/incubator/tvheadend/SCALE/item.yaml
similarity index 100%
rename from incubator/tvheadend/item.yaml
rename to incubator/tvheadend/SCALE/item.yaml
diff --git a/incubator/tvheadend/4.1.5/ix_values.yaml b/incubator/tvheadend/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/tvheadend/4.1.5/ix_values.yaml
rename to incubator/tvheadend/SCALE/ix_values.yaml
diff --git a/incubator/tvheadend/4.1.5/questions.yaml b/incubator/tvheadend/SCALE/questions.yaml
similarity index 100%
rename from incubator/tvheadend/4.1.5/questions.yaml
rename to incubator/tvheadend/SCALE/questions.yaml
diff --git a/incubator/tvheadend/4.1.5/app-readme.md b/incubator/tvheadend/app-readme.md
similarity index 100%
rename from incubator/tvheadend/4.1.5/app-readme.md
rename to incubator/tvheadend/app-readme.md
diff --git a/incubator/truecommand/3.1.5/templates/common.yaml b/incubator/tvheadend/templates/common.yaml
similarity index 100%
rename from incubator/truecommand/3.1.5/templates/common.yaml
rename to incubator/tvheadend/templates/common.yaml
diff --git a/incubator/tvheadend/4.1.5/test_values.yaml b/incubator/tvheadend/values.yaml
similarity index 100%
rename from incubator/tvheadend/4.1.5/test_values.yaml
rename to incubator/tvheadend/values.yaml
diff --git a/incubator/unifi/3.1.5/.helmignore b/incubator/unifi/.helmignore
similarity index 100%
rename from incubator/unifi/3.1.5/.helmignore
rename to incubator/unifi/.helmignore
diff --git a/incubator/unifi/3.1.5/Chart.lock b/incubator/unifi/3.1.5/Chart.lock
deleted file mode 100644
index a912e366d88..00000000000
--- a/incubator/unifi/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:33.810007781Z"
diff --git a/incubator/unifi/3.1.5/charts/common-3.5.5.tgz b/incubator/unifi/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/incubator/unifi/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/incubator/unifi/3.1.5/values.yaml b/incubator/unifi/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/incubator/unifi/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/tvheadend/4.1.5/CONFIG.md b/incubator/unifi/CONFIG.md
similarity index 100%
rename from incubator/tvheadend/4.1.5/CONFIG.md
rename to incubator/unifi/CONFIG.md
diff --git a/incubator/unifi/3.1.5/Chart.yaml b/incubator/unifi/Chart.yaml
similarity index 100%
rename from incubator/unifi/3.1.5/Chart.yaml
rename to incubator/unifi/Chart.yaml
diff --git a/incubator/unifi/3.1.5/README.md b/incubator/unifi/README.md
similarity index 100%
rename from incubator/unifi/3.1.5/README.md
rename to incubator/unifi/README.md
diff --git a/incubator/unifi/item.yaml b/incubator/unifi/SCALE/item.yaml
similarity index 100%
rename from incubator/unifi/item.yaml
rename to incubator/unifi/SCALE/item.yaml
diff --git a/incubator/unifi/3.1.5/ix_values.yaml b/incubator/unifi/SCALE/ix_values.yaml
similarity index 100%
rename from incubator/unifi/3.1.5/ix_values.yaml
rename to incubator/unifi/SCALE/ix_values.yaml
diff --git a/incubator/unifi/3.1.5/questions.yaml b/incubator/unifi/SCALE/questions.yaml
similarity index 100%
rename from incubator/unifi/3.1.5/questions.yaml
rename to incubator/unifi/SCALE/questions.yaml
diff --git a/incubator/unifi/3.1.5/app-readme.md b/incubator/unifi/app-readme.md
similarity index 100%
rename from incubator/unifi/3.1.5/app-readme.md
rename to incubator/unifi/app-readme.md
diff --git a/incubator/tvheadend/4.1.5/templates/common.yaml b/incubator/unifi/templates/common.yaml
similarity index 100%
rename from incubator/tvheadend/4.1.5/templates/common.yaml
rename to incubator/unifi/templates/common.yaml
diff --git a/incubator/unifi/3.1.5/test_values.yaml b/incubator/unifi/values.yaml
similarity index 100%
rename from incubator/unifi/3.1.5/test_values.yaml
rename to incubator/unifi/values.yaml
diff --git a/incubator/organizr/3.1.5/.helmignore b/stable/bitwarden/.helmignore
similarity index 100%
rename from incubator/organizr/3.1.5/.helmignore
rename to stable/bitwarden/.helmignore
diff --git a/stable/bitwarden/1.2.5/Chart.lock b/stable/bitwarden/1.2.5/Chart.lock
deleted file mode 100644
index a9ba3676c25..00000000000
--- a/stable/bitwarden/1.2.5/Chart.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-- name: postgresql
- repository: https://charts.bitnami.com/bitnami
- version: 10.4.2
-digest: sha256:feb1c5155f10c340b5a984ce39eb7c532c938ac71287bfa65398ef3fe458c902
-generated: "2021-05-04T15:27:23.792061612Z"
diff --git a/stable/bitwarden/1.2.5/charts/common-3.5.5.tgz b/stable/bitwarden/1.2.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/bitwarden/1.2.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/bitwarden/1.2.5/charts/postgresql-10.4.2.tgz b/stable/bitwarden/1.2.5/charts/postgresql-10.4.2.tgz
deleted file mode 100644
index 1067fe424a3..00000000000
Binary files a/stable/bitwarden/1.2.5/charts/postgresql-10.4.2.tgz and /dev/null differ
diff --git a/stable/bitwarden/1.2.5/values.yaml b/stable/bitwarden/1.2.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/bitwarden/1.2.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/incubator/unifi/3.1.5/CONFIG.md b/stable/bitwarden/CONFIG.md
similarity index 100%
rename from incubator/unifi/3.1.5/CONFIG.md
rename to stable/bitwarden/CONFIG.md
diff --git a/stable/bitwarden/1.2.5/Chart.yaml b/stable/bitwarden/Chart.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/Chart.yaml
rename to stable/bitwarden/Chart.yaml
diff --git a/stable/bitwarden/1.2.5/README.md b/stable/bitwarden/README.md
similarity index 100%
rename from stable/bitwarden/1.2.5/README.md
rename to stable/bitwarden/README.md
diff --git a/stable/bitwarden/item.yaml b/stable/bitwarden/SCALE/item.yaml
similarity index 100%
rename from stable/bitwarden/item.yaml
rename to stable/bitwarden/SCALE/item.yaml
diff --git a/stable/bitwarden/1.2.5/ix_values.yaml b/stable/bitwarden/SCALE/ix_values.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/ix_values.yaml
rename to stable/bitwarden/SCALE/ix_values.yaml
diff --git a/stable/bitwarden/1.2.5/questions.yaml b/stable/bitwarden/SCALE/questions.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/questions.yaml
rename to stable/bitwarden/SCALE/questions.yaml
diff --git a/stable/bitwarden/1.2.5/app-readme.md b/stable/bitwarden/app-readme.md
similarity index 100%
rename from stable/bitwarden/1.2.5/app-readme.md
rename to stable/bitwarden/app-readme.md
diff --git a/stable/bitwarden/1.2.5/templates/_specialingress.tpl b/stable/bitwarden/templates/_specialingress.tpl
similarity index 100%
rename from stable/bitwarden/1.2.5/templates/_specialingress.tpl
rename to stable/bitwarden/templates/_specialingress.tpl
diff --git a/stable/bitwarden/1.2.5/templates/_validate.tpl b/stable/bitwarden/templates/_validate.tpl
similarity index 100%
rename from stable/bitwarden/1.2.5/templates/_validate.tpl
rename to stable/bitwarden/templates/_validate.tpl
diff --git a/stable/bitwarden/1.2.5/templates/common.yaml b/stable/bitwarden/templates/common.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/templates/common.yaml
rename to stable/bitwarden/templates/common.yaml
diff --git a/stable/bitwarden/1.2.5/templates/configmap.yaml b/stable/bitwarden/templates/configmap.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/templates/configmap.yaml
rename to stable/bitwarden/templates/configmap.yaml
diff --git a/stable/bitwarden/1.2.5/templates/secrets.yaml b/stable/bitwarden/templates/secrets.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/templates/secrets.yaml
rename to stable/bitwarden/templates/secrets.yaml
diff --git a/stable/bitwarden/1.2.5/test_values.yaml b/stable/bitwarden/values.yaml
similarity index 100%
rename from stable/bitwarden/1.2.5/test_values.yaml
rename to stable/bitwarden/values.yaml
diff --git a/stable/collabora-online/3.1.5/Chart.lock b/stable/collabora-online/3.1.5/Chart.lock
deleted file mode 100644
index db33ac1a342..00000000000
--- a/stable/collabora-online/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:14.100107609Z"
diff --git a/stable/collabora-online/3.1.5/charts/common-3.5.5.tgz b/stable/collabora-online/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/collabora-online/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/collabora-online/3.1.5/values.yaml b/stable/collabora-online/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/collabora-online/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/bitwarden/1.2.5/CONFIG.md b/stable/collabora-online/CONFIG.md
similarity index 100%
rename from stable/bitwarden/1.2.5/CONFIG.md
rename to stable/collabora-online/CONFIG.md
diff --git a/stable/collabora-online/3.1.5/Chart.yaml b/stable/collabora-online/Chart.yaml
similarity index 100%
rename from stable/collabora-online/3.1.5/Chart.yaml
rename to stable/collabora-online/Chart.yaml
diff --git a/stable/collabora-online/3.1.5/README.md b/stable/collabora-online/README.md
similarity index 100%
rename from stable/collabora-online/3.1.5/README.md
rename to stable/collabora-online/README.md
diff --git a/stable/collabora-online/item.yaml b/stable/collabora-online/SCALE/item.yaml
similarity index 100%
rename from stable/collabora-online/item.yaml
rename to stable/collabora-online/SCALE/item.yaml
diff --git a/stable/collabora-online/3.1.5/ix_values.yaml b/stable/collabora-online/SCALE/ix_values.yaml
similarity index 100%
rename from stable/collabora-online/3.1.5/ix_values.yaml
rename to stable/collabora-online/SCALE/ix_values.yaml
diff --git a/stable/collabora-online/3.1.5/questions.yaml b/stable/collabora-online/SCALE/questions.yaml
similarity index 100%
rename from stable/collabora-online/3.1.5/questions.yaml
rename to stable/collabora-online/SCALE/questions.yaml
diff --git a/stable/collabora-online/3.1.5/app-readme.md b/stable/collabora-online/app-readme.md
similarity index 100%
rename from stable/collabora-online/3.1.5/app-readme.md
rename to stable/collabora-online/app-readme.md
diff --git a/incubator/unifi/3.1.5/templates/common.yaml b/stable/collabora-online/templates/common.yaml
similarity index 100%
rename from incubator/unifi/3.1.5/templates/common.yaml
rename to stable/collabora-online/templates/common.yaml
diff --git a/stable/collabora-online/3.1.5/test_values.yaml b/stable/collabora-online/values.yaml
similarity index 100%
rename from stable/collabora-online/3.1.5/test_values.yaml
rename to stable/collabora-online/values.yaml
diff --git a/incubator/truecommand/3.1.5/.helmignore b/stable/deepstack-cpu/.helmignore
similarity index 100%
rename from incubator/truecommand/3.1.5/.helmignore
rename to stable/deepstack-cpu/.helmignore
diff --git a/stable/deepstack-cpu/1.0.3/Chart.lock b/stable/deepstack-cpu/1.0.3/Chart.lock
deleted file mode 100644
index 0087b2e8c10..00000000000
--- a/stable/deepstack-cpu/1.0.3/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:11.632952342Z"
diff --git a/stable/deepstack-cpu/1.0.3/charts/common-3.5.5.tgz b/stable/deepstack-cpu/1.0.3/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/deepstack-cpu/1.0.3/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/deepstack-cpu/1.0.3/values.yaml b/stable/deepstack-cpu/1.0.3/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/deepstack-cpu/1.0.3/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/collabora-online/3.1.5/CONFIG.md b/stable/deepstack-cpu/CONFIG.md
similarity index 100%
rename from stable/collabora-online/3.1.5/CONFIG.md
rename to stable/deepstack-cpu/CONFIG.md
diff --git a/stable/deepstack-cpu/1.0.3/Chart.yaml b/stable/deepstack-cpu/Chart.yaml
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/Chart.yaml
rename to stable/deepstack-cpu/Chart.yaml
diff --git a/stable/deepstack-cpu/1.0.3/README.md b/stable/deepstack-cpu/README.md
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/README.md
rename to stable/deepstack-cpu/README.md
diff --git a/stable/deepstack-cpu/item.yaml b/stable/deepstack-cpu/SCALE/item.yaml
similarity index 71%
rename from stable/deepstack-cpu/item.yaml
rename to stable/deepstack-cpu/SCALE/item.yaml
index e3bed765089..fbadfd71723 100644
--- a/stable/deepstack-cpu/item.yaml
+++ b/stable/deepstack-cpu/SCALE/item.yaml
@@ -1,3 +1,3 @@
categories:
- AI
-icon_url: https://deepquest.sfo2.digitaloceanspaces.com/deepstackcc/static/img/deepstacklogo.png
\ No newline at end of file
+icon_url: https://deepquest.sfo2.digitaloceanspaces.com/deepstackcc/static/img/deepstacklogo.png
diff --git a/stable/deepstack-cpu/1.0.3/ix_values.yaml b/stable/deepstack-cpu/SCALE/ix_values.yaml
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/ix_values.yaml
rename to stable/deepstack-cpu/SCALE/ix_values.yaml
diff --git a/stable/deepstack-cpu/1.0.3/questions.yaml b/stable/deepstack-cpu/SCALE/questions.yaml
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/questions.yaml
rename to stable/deepstack-cpu/SCALE/questions.yaml
diff --git a/stable/deepstack-cpu/1.0.3/app-readme.md b/stable/deepstack-cpu/app-readme.md
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/app-readme.md
rename to stable/deepstack-cpu/app-readme.md
diff --git a/stable/collabora-online/3.1.5/templates/common.yaml b/stable/deepstack-cpu/templates/common.yaml
similarity index 100%
rename from stable/collabora-online/3.1.5/templates/common.yaml
rename to stable/deepstack-cpu/templates/common.yaml
diff --git a/stable/deepstack-cpu/1.0.3/test_values.yaml b/stable/deepstack-cpu/values.yaml
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/test_values.yaml
rename to stable/deepstack-cpu/values.yaml
diff --git a/stable/bitwarden/1.2.5/.helmignore b/stable/emby/.helmignore
similarity index 100%
rename from stable/bitwarden/1.2.5/.helmignore
rename to stable/emby/.helmignore
diff --git a/stable/emby/3.1.5/Chart.lock b/stable/emby/3.1.5/Chart.lock
deleted file mode 100644
index df643bf66d1..00000000000
--- a/stable/emby/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:09.168226989Z"
diff --git a/stable/emby/3.1.5/charts/common-3.5.5.tgz b/stable/emby/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/emby/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/emby/3.1.5/values.yaml b/stable/emby/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/emby/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/deepstack-cpu/1.0.3/CONFIG.md b/stable/emby/CONFIG.md
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/CONFIG.md
rename to stable/emby/CONFIG.md
diff --git a/stable/emby/3.1.5/Chart.yaml b/stable/emby/Chart.yaml
similarity index 100%
rename from stable/emby/3.1.5/Chart.yaml
rename to stable/emby/Chart.yaml
diff --git a/stable/emby/3.1.5/README.md b/stable/emby/README.md
similarity index 100%
rename from stable/emby/3.1.5/README.md
rename to stable/emby/README.md
diff --git a/stable/emby/item.yaml b/stable/emby/SCALE/item.yaml
similarity index 100%
rename from stable/emby/item.yaml
rename to stable/emby/SCALE/item.yaml
diff --git a/stable/emby/3.1.5/ix_values.yaml b/stable/emby/SCALE/ix_values.yaml
similarity index 100%
rename from stable/emby/3.1.5/ix_values.yaml
rename to stable/emby/SCALE/ix_values.yaml
diff --git a/stable/emby/3.1.5/questions.yaml b/stable/emby/SCALE/questions.yaml
similarity index 100%
rename from stable/emby/3.1.5/questions.yaml
rename to stable/emby/SCALE/questions.yaml
diff --git a/stable/emby/3.1.5/app-readme.md b/stable/emby/app-readme.md
similarity index 100%
rename from stable/emby/3.1.5/app-readme.md
rename to stable/emby/app-readme.md
diff --git a/stable/deepstack-cpu/1.0.3/templates/common.yaml b/stable/emby/templates/common.yaml
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/templates/common.yaml
rename to stable/emby/templates/common.yaml
diff --git a/stable/emby/3.1.5/test_values.yaml b/stable/emby/values.yaml
similarity index 100%
rename from stable/emby/3.1.5/test_values.yaml
rename to stable/emby/values.yaml
diff --git a/stable/deepstack-cpu/1.0.3/.helmignore b/stable/esphome/.helmignore
similarity index 100%
rename from stable/deepstack-cpu/1.0.3/.helmignore
rename to stable/esphome/.helmignore
diff --git a/stable/esphome/3.1.5/Chart.lock b/stable/esphome/3.1.5/Chart.lock
deleted file mode 100644
index b52b2167e8c..00000000000
--- a/stable/esphome/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:06.26386481Z"
diff --git a/stable/esphome/3.1.5/charts/common-3.5.5.tgz b/stable/esphome/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/esphome/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/esphome/3.1.5/values.yaml b/stable/esphome/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/esphome/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/emby/3.1.5/CONFIG.md b/stable/esphome/CONFIG.md
similarity index 100%
rename from stable/emby/3.1.5/CONFIG.md
rename to stable/esphome/CONFIG.md
diff --git a/stable/esphome/3.1.5/Chart.yaml b/stable/esphome/Chart.yaml
similarity index 100%
rename from stable/esphome/3.1.5/Chart.yaml
rename to stable/esphome/Chart.yaml
diff --git a/stable/esphome/3.1.5/README.md b/stable/esphome/README.md
similarity index 100%
rename from stable/esphome/3.1.5/README.md
rename to stable/esphome/README.md
diff --git a/stable/esphome/item.yaml b/stable/esphome/SCALE/item.yaml
similarity index 100%
rename from stable/esphome/item.yaml
rename to stable/esphome/SCALE/item.yaml
diff --git a/stable/esphome/3.1.5/ix_values.yaml b/stable/esphome/SCALE/ix_values.yaml
similarity index 100%
rename from stable/esphome/3.1.5/ix_values.yaml
rename to stable/esphome/SCALE/ix_values.yaml
diff --git a/stable/esphome/3.1.5/questions.yaml b/stable/esphome/SCALE/questions.yaml
similarity index 100%
rename from stable/esphome/3.1.5/questions.yaml
rename to stable/esphome/SCALE/questions.yaml
diff --git a/stable/esphome/3.1.5/app-readme.md b/stable/esphome/app-readme.md
similarity index 100%
rename from stable/esphome/3.1.5/app-readme.md
rename to stable/esphome/app-readme.md
diff --git a/stable/emby/3.1.5/templates/common.yaml b/stable/esphome/templates/common.yaml
similarity index 100%
rename from stable/emby/3.1.5/templates/common.yaml
rename to stable/esphome/templates/common.yaml
diff --git a/stable/esphome/3.1.5/test_values.yaml b/stable/esphome/values.yaml
similarity index 100%
rename from stable/esphome/3.1.5/test_values.yaml
rename to stable/esphome/values.yaml
diff --git a/stable/handbrake/3.1.5/Chart.lock b/stable/handbrake/3.1.5/Chart.lock
deleted file mode 100644
index cb77bc15c9f..00000000000
--- a/stable/handbrake/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:03.183136778Z"
diff --git a/stable/handbrake/3.1.5/charts/common-3.5.5.tgz b/stable/handbrake/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/handbrake/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/handbrake/3.1.5/values.yaml b/stable/handbrake/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/handbrake/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/esphome/3.1.5/CONFIG.md b/stable/handbrake/CONFIG.md
similarity index 100%
rename from stable/esphome/3.1.5/CONFIG.md
rename to stable/handbrake/CONFIG.md
diff --git a/stable/handbrake/3.1.5/Chart.yaml b/stable/handbrake/Chart.yaml
similarity index 100%
rename from stable/handbrake/3.1.5/Chart.yaml
rename to stable/handbrake/Chart.yaml
diff --git a/stable/handbrake/3.1.5/README.md b/stable/handbrake/README.md
similarity index 100%
rename from stable/handbrake/3.1.5/README.md
rename to stable/handbrake/README.md
diff --git a/stable/handbrake/item.yaml b/stable/handbrake/SCALE/item.yaml
similarity index 100%
rename from stable/handbrake/item.yaml
rename to stable/handbrake/SCALE/item.yaml
diff --git a/stable/handbrake/3.1.5/ix_values.yaml b/stable/handbrake/SCALE/ix_values.yaml
similarity index 100%
rename from stable/handbrake/3.1.5/ix_values.yaml
rename to stable/handbrake/SCALE/ix_values.yaml
diff --git a/stable/handbrake/3.1.5/questions.yaml b/stable/handbrake/SCALE/questions.yaml
similarity index 100%
rename from stable/handbrake/3.1.5/questions.yaml
rename to stable/handbrake/SCALE/questions.yaml
diff --git a/stable/handbrake/3.1.5/app-readme.md b/stable/handbrake/app-readme.md
similarity index 100%
rename from stable/handbrake/3.1.5/app-readme.md
rename to stable/handbrake/app-readme.md
diff --git a/stable/esphome/3.1.5/templates/common.yaml b/stable/handbrake/templates/common.yaml
similarity index 100%
rename from stable/esphome/3.1.5/templates/common.yaml
rename to stable/handbrake/templates/common.yaml
diff --git a/stable/handbrake/3.1.5/test_values.yaml b/stable/handbrake/values.yaml
similarity index 100%
rename from stable/handbrake/3.1.5/test_values.yaml
rename to stable/handbrake/values.yaml
diff --git a/stable/emby/3.1.5/.helmignore b/stable/home-assistant/.helmignore
similarity index 100%
rename from stable/emby/3.1.5/.helmignore
rename to stable/home-assistant/.helmignore
diff --git a/stable/home-assistant/3.1.5/Chart.lock b/stable/home-assistant/3.1.5/Chart.lock
deleted file mode 100644
index 2f105a56f0a..00000000000
--- a/stable/home-assistant/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:27:00.705292853Z"
diff --git a/stable/home-assistant/3.1.5/charts/common-3.5.5.tgz b/stable/home-assistant/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/home-assistant/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/home-assistant/3.1.5/values.yaml b/stable/home-assistant/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/home-assistant/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/handbrake/3.1.5/CONFIG.md b/stable/home-assistant/CONFIG.md
similarity index 100%
rename from stable/handbrake/3.1.5/CONFIG.md
rename to stable/home-assistant/CONFIG.md
diff --git a/stable/home-assistant/3.1.5/Chart.yaml b/stable/home-assistant/Chart.yaml
similarity index 100%
rename from stable/home-assistant/3.1.5/Chart.yaml
rename to stable/home-assistant/Chart.yaml
diff --git a/stable/home-assistant/3.1.5/README.md b/stable/home-assistant/README.md
similarity index 100%
rename from stable/home-assistant/3.1.5/README.md
rename to stable/home-assistant/README.md
diff --git a/stable/home-assistant/item.yaml b/stable/home-assistant/SCALE/item.yaml
similarity index 100%
rename from stable/home-assistant/item.yaml
rename to stable/home-assistant/SCALE/item.yaml
diff --git a/stable/home-assistant/3.1.5/ix_values.yaml b/stable/home-assistant/SCALE/ix_values.yaml
similarity index 100%
rename from stable/home-assistant/3.1.5/ix_values.yaml
rename to stable/home-assistant/SCALE/ix_values.yaml
diff --git a/stable/home-assistant/3.1.5/questions.yaml b/stable/home-assistant/SCALE/questions.yaml
similarity index 100%
rename from stable/home-assistant/3.1.5/questions.yaml
rename to stable/home-assistant/SCALE/questions.yaml
diff --git a/stable/home-assistant/3.1.5/app-readme.md b/stable/home-assistant/app-readme.md
similarity index 100%
rename from stable/home-assistant/3.1.5/app-readme.md
rename to stable/home-assistant/app-readme.md
diff --git a/stable/handbrake/3.1.5/templates/common.yaml b/stable/home-assistant/templates/common.yaml
similarity index 100%
rename from stable/handbrake/3.1.5/templates/common.yaml
rename to stable/home-assistant/templates/common.yaml
diff --git a/stable/home-assistant/3.1.5/templates/secret.yaml b/stable/home-assistant/templates/secret.yaml
similarity index 100%
rename from stable/home-assistant/3.1.5/templates/secret.yaml
rename to stable/home-assistant/templates/secret.yaml
diff --git a/stable/home-assistant/3.1.5/test_values.yaml b/stable/home-assistant/values.yaml
similarity index 100%
rename from stable/home-assistant/3.1.5/test_values.yaml
rename to stable/home-assistant/values.yaml
diff --git a/stable/esphome/3.1.5/.helmignore b/stable/jackett/.helmignore
similarity index 100%
rename from stable/esphome/3.1.5/.helmignore
rename to stable/jackett/.helmignore
diff --git a/stable/jackett/3.1.5/Chart.lock b/stable/jackett/3.1.5/Chart.lock
deleted file mode 100644
index b0832134817..00000000000
--- a/stable/jackett/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:57.938658773Z"
diff --git a/stable/jackett/3.1.5/README.md b/stable/jackett/3.1.5/README.md
deleted file mode 100644
index 88c3c913b18..00000000000
--- a/stable/jackett/3.1.5/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Introduction
-
-  
-
-API Support for your favorite torrent trackers.
-
-TrueCharts are designed to be installed as TrueNAS SCALE app only. We can not guarantee this charts works as a stand-alone helm installation.
-**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/apps/issues/new/choose)**
-
-## Source Code
-
-*
-*
-*
-*
-
-## Requirements
-
-Kubernetes: `>=1.16.0-0`
-
-## Dependencies
-
-| Repository | Name | Version |
-|------------|------|---------|
-| https://truecharts.org/ | common | 3.5.5 |
-
-## Installing the Chart
-
-To install the chart with the release name `jackett`
-
-- Open TrueNAS SCALE
-- Go to Apps
-- Click "Install" for this specific Apps
-- Fill out the configuration form
-
-## Uninstalling the Chart
-
-To uninstall the `jackett` deployment
-
-- Open TrueNAS SCALE
-- Go to Apps
-- Go to "Installed Apps"
-- Expand the menu in the top-right corner of this App
-- Click "Remove" for this specific Apps
-
-The command removes all the Kubernetes components associated with the chart **including storage volumes** _(Except hostPath Storage)_ and deletes the release.
-
-## Support
-
-- See the [Wiki](https://truecharts.org)
-- Open a [issue](https://github.com/truecharts/apps/issues/new/choose)
-- Ask a [question](https://github.com/truecharts/apps/discussions)
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
-All Rights Reserved - The TrueCharts Project
diff --git a/stable/jackett/3.1.5/charts/common-3.5.5.tgz b/stable/jackett/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/jackett/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/jackett/3.1.5/questions.yaml b/stable/jackett/3.1.5/questions.yaml
deleted file mode 100644
index 6de48d7f95a..00000000000
--- a/stable/jackett/3.1.5/questions.yaml
+++ /dev/null
@@ -1,434 +0,0 @@
-groups:
- - name: "Container Image"
- description: "Image to be used for container"
- - name: "Workload Configuration"
- description: "Configure workload deployment"
- - name: "Configuration"
- description: "additional container configuration"
- - name: "Networking"
- description: "Configure / service for container"
- - name: "Storage"
- description: "Persist and share data that is separate from the lifecycle of the container"
- - name: "Resources and Devices"
- description: "Specify resources/devices to be allocated to workload"
- - name: "Reverse Proxy Configuration"
- description: "Reverse Proxy configuration"
- - name: "Advanced"
- description: "Advanced Configuration"
- - name: "WARNING"
- description: "WARNING"
-portals:
- web_portal:
- protocols:
- - "$kubernetes-resource_configmap_portal_protocol"
- host:
- - "$kubernetes-resource_configmap_portal_host"
- ports:
- - "$kubernetes-resource_configmap_portal_port"
-questions:
- - variable: portal
- group: "Container Image"
- label: "Configure Portal Button"
- schema:
- type: dict
- hidden: true
- attrs:
- - variable: enabled
- label: "Enable"
- description: "enable the portal button"
- schema:
- hidden: true
- editable: false
- type: boolean
- default: true
- # Update Policy
- - variable: strategyType
- group: "Container Image"
- label: "Update Strategy"
- schema:
- type: string
- default: "Recreate"
- enum:
- - value: "RollingUpdate"
- description: "Create new pods and then kill old ones"
- - value: "Recreate"
- description: "Kill existing pods before creating new ones"
- # Configure Time Zone
- - variable: timezone
- group: "Container Image"
- label: "Timezone"
- schema:
- type: string
- default: "Etc/UTC"
- $ref:
- - "definitions/timezone"
-
- # Configure Enviroment Variables
- - variable: environmentVariables
- label: "Image environment"
- group: "Configuration"
- schema:
- type: list
- default: []
- items:
- - variable: environmentVariable
- label: "Environment Variable"
- schema:
- type: dict
- attrs:
- - variable: name
- label: "Name"
- schema:
- type: string
- - variable: value
- label: "Value"
- schema:
- type: string
- # Enable Host Networking
- - variable: hostNetwork
- group: "Networking"
- label: "Enable Host Networking"
- schema:
- type: boolean
- default: false
- - variable: services
- group: "Networking"
- label: "Configure Service"
- schema:
- type: dict
- attrs:
- - variable: main
- label: "Main service"
- description: "The Primary service on which the healthcheck runs, often the webUI"
- schema:
- type: dict
- attrs:
- - variable: enabled
- label: "Enable the service"
- schema:
- type: boolean
- default: true
- hidden: true
- - variable: type
- label: "Service type"
- description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
- schema:
- type: string
- default: "ClusterIP"
- enum:
- - value: "NodePort"
- description: "NodePort"
- - value: "ClusterIP"
- description: "ClusterIP"
- - variable: port
- label: "Port configuration"
- schema:
- type: dict
- attrs:
- - variable: protocol
- label: "Port Type"
- schema:
- type: string
- default: "HTTP"
- hidden: false
- enum:
- - value: HTTP
- description: "HTTP"
- - value: "HTTPS"
- description: "HTTPS"
- - variable: port
- label: "container port"
- schema:
- type: int
- default: 9117
- editable: false
- hidden: true
- - variable: targetport
- label: "Internal Service port"
- description: "When connecting internally to this App, you'll need this port"
- schema:
- type: int
- default: 9117
- editable: false
- hidden: true
- - variable: nodePort
- label: "(optional) host nodePort to expose to"
- description: "only get used when nodePort is selected"
- schema:
- type: int
- min: 9000
- max: 65535
- default: 36009
- required: true
-## TrueCharts Specific
- - variable: persistence
- label: "Integrated Persistent Storage"
- group: "Storage"
- schema:
- type: dict
- attrs:
- - variable: config
- label: "App Config Storage"
- description: "Stores the Application Configuration."
- schema:
- type: dict
- attrs:
- - variable: enabled
- label: "Enable the storage"
- schema:
- type: boolean
- default: true
- hidden: true
- - variable: storageClass
- label: "Type of Storage"
- description: " Warning: Anything other than Internal will break rollback!"
- schema:
- type: string
- default: ""
- enum:
- - value: ""
- description: "Internal"
- - variable: mountPath
- label: "mountPath"
- description: "Path inside the container the storage is mounted"
- schema:
- type: string
- default: "/config"
- hidden: true
- - variable: emptyDir
- label: "Mount a ramdisk instead of actual storage"
- schema:
- type: boolean
- default: false
- hidden: true
- - variable: accessMode
- label: "Access Mode (Advanced)"
- description: "Allow or disallow multiple PVC's writhing to the same PVC"
- schema:
- type: string
- default: "ReadWriteOnce"
- enum:
- - value: "ReadWriteOnce"
- description: "ReadWriteOnce"
- - value: "ReadOnlyMany"
- description: "ReadOnlyMany"
- - value: "ReadWriteMany"
- description: "ReadWriteMany"
- - variable: size
- label: "Size quotum of storage"
- schema:
- type: string
- default: "100Gi"
- - variable: customStorage
- label: "Custom app storage"
- group: "Storage"
- schema:
- type: list
- default: []
- items:
- - variable: volumeMount
- label: "Custom Storage"
- schema:
- type: dict
- attrs:
- - variable: enabled
- label: "Enabled"
- schema:
- type: boolean
- default: true
- required: true
- hidden: true
- editable: false
- - variable: setPermissions
- label: "Automatic Permissions"
- description: "Automatically set permissions on install"
- schema:
- type: boolean
- default: true
- hidden: false
- - variable: readOnly
- label: "Mount as ReadOnly"
- description: "prevent any write from being done to the mounted volume"
- schema:
- type: boolean
- default: false
- hidden: false
- - variable: emptyDir
- label: "emptyDir"
- schema:
- type: boolean
- default: false
- hidden: true
- editable: false
- - variable: mountPath
- label: "Mount Path"
- description: "Path to mount inside the pod"
- schema:
- type: path
- required: true
- default: ""
- editable: true
- - variable: hostPath
- label: "Host Path"
- schema:
- type: hostpath
- required: true
- - variable: ingress
- label: ""
- group: "Reverse Proxy Configuration"
- schema:
- type: dict
- attrs:
- - variable: main
- label: "WebUI"
- schema:
- type: dict
- attrs:
- - variable: certType
- label: "Select Reverse-Proxy Type"
- schema:
- type: string
- default: "disabled"
- enum:
- - value: "disabled"
- description: "Disabled"
- - value: ""
- description: "No Encryption/TLS/Certificates"
- - value: "selfsigned"
- description: "Self-Signed Certificate"
- - value: "ixcert"
- description: "TrueNAS SCALE Certificate"
- - variable: type
- label: "Reverse Proxy Type"
- schema:
- type: string
- default: "HTTP"
- hidden: true
- editable: false
- required: true
- - variable: serviceName
- label: "Service name to proxy to"
- schema:
- hidden: true
- editable: false
- type: string
- default: ""
- - variable: entrypoint
- label: "Select Entrypoint"
- schema:
- show_if: [["certType", "!=", "disabled"]]
- type: string
- default: "websecure"
- required: true
- enum:
- - value: "websecure"
- description: "Websecure: HTTPS/TLS port 443"
- - variable: hosts
- label: "Hosts"
- schema:
- show_if: [["certType", "!=", "disabled"]]
- type: list
- default: []
- items:
- - variable: host
- label: "Host"
- schema:
- type: dict
- attrs:
- - variable: host
- label: "Domain Name"
- required: true
- schema:
- type: string
- - variable: path
- label: "path"
- schema:
- type: string
- required: true
- hidden: true
- default: "/"
- - variable: certificate
- label: "Select TrueNAS SCALE Certificate"
- schema:
- type: int
- show_if: [["certType", "=", "ixcert"]]
- $ref:
- - "definitions/certificate"
- - variable: authForwardURL
- label: "Forward Authentication URL"
- schema:
- show_if: [["certType", "!=", "disabled"]]
- type: string
- default: ""
-
- - variable: UMASK
- group: "Advanced"
- label: "UMASK"
- description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
- schema:
- type: string
- default: "002"
- # Enable privileged
- - variable: securityContext
- group: "Advanced"
- label: "Security Context"
- schema:
- type: dict
- attrs:
- - variable: privileged
- label: "Enable privileged mode for Common-Chart based charts"
- schema:
- type: boolean
- default: false
- # Set Pod Security Policy
- - variable: podSecurityContext
- group: "Advanced"
- label: "Pod Security Context"
- schema:
- type: dict
- attrs:
- - variable: runAsNonRoot
- label: "runAsNonRoot"
- schema:
- type: boolean
- default: true
- - variable: runAsUser
- label: "runAsUser"
- description: "The UserID of the user running the application"
- schema:
- type: int
- default: 568
- - variable: runAsGroup
- label: "runAsGroup"
- description: The groupID this App of the user running the application"
- schema:
- type: int
- default: 568
- - variable: supplementalGroups
- label: "supplementalGroups"
- description: "Additional groups this App needs access to"
- schema:
- type: list
- default: []
- items:
- - variable: Group
- label: "Group"
- schema:
- type: int
- default: 568
- - variable: fsGroup
- label: "fsGroup"
- description: "The group that should own ALL storage."
- schema:
- type: int
- default: 568
- - variable: fsGroupChangePolicy
- label: "When should we take ownership?"
- schema:
- type: string
- default: "OnRootMismatch"
- enum:
- - value: "OnRootMismatch"
- description: "OnRootMismatch"
- - value: "Always"
- description: "Always"
diff --git a/stable/jackett/3.1.5/test_values.yaml b/stable/jackett/3.1.5/test_values.yaml
deleted file mode 100644
index 77ee8243700..00000000000
--- a/stable/jackett/3.1.5/test_values.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Default values for Jackett.
-
-image:
- repository: ghcr.io/truecharts/jackett
- pullPolicy: IfNotPresent
- tag: v0.17.1011
-
-strategy:
- type: Recreate
-
-
-services:
- main:
- enabled: true
- port:
- port: 9117
-
-env: {}
- # TZ: UTC
- # PUID: 1001
- # PGID: 1001
-
-
-persistence:
- config:
- enabled: true
- mountPath: "/config"
- emptyDir: true
- accessMode: ReadWriteOnce
- size: 1Gi
- storageClass: ""
-
-
-## TrueCharts Values
-
-ingress:
- main:
- enabled: true
- # Used when including ingress using {{ include "common.ingress" . }}
- type: "HTTP"
- entrypoint: "websecure"
- certType: ""
- annotations: {}
- hosts:
- - host: chart-example.local
- path: /
diff --git a/stable/jackett/3.1.5/values.yaml b/stable/jackett/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/jackett/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/home-assistant/3.1.5/CONFIG.md b/stable/jackett/CONFIG.md
similarity index 100%
rename from stable/home-assistant/3.1.5/CONFIG.md
rename to stable/jackett/CONFIG.md
diff --git a/stable/jackett/3.1.5/Chart.yaml b/stable/jackett/Chart.yaml
similarity index 100%
rename from stable/jackett/3.1.5/Chart.yaml
rename to stable/jackett/Chart.yaml
diff --git a/.test/jackett/README.md b/stable/jackett/README.md
similarity index 100%
rename from .test/jackett/README.md
rename to stable/jackett/README.md
diff --git a/.test/jackett/SCALE/item.yaml b/stable/jackett/SCALE/item.yaml
similarity index 100%
rename from .test/jackett/SCALE/item.yaml
rename to stable/jackett/SCALE/item.yaml
diff --git a/stable/jackett/3.1.5/ix_values.yaml b/stable/jackett/SCALE/ix_values.yaml
similarity index 100%
rename from stable/jackett/3.1.5/ix_values.yaml
rename to stable/jackett/SCALE/ix_values.yaml
diff --git a/.test/jackett/SCALE/questions.yaml b/stable/jackett/SCALE/questions.yaml
similarity index 100%
rename from .test/jackett/SCALE/questions.yaml
rename to stable/jackett/SCALE/questions.yaml
diff --git a/stable/jackett/3.1.5/app-readme.md b/stable/jackett/app-readme.md
similarity index 100%
rename from stable/jackett/3.1.5/app-readme.md
rename to stable/jackett/app-readme.md
diff --git a/stable/jackett/item.yaml b/stable/jackett/item.yaml
deleted file mode 100644
index 8d747307488..00000000000
--- a/stable/jackett/item.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-categories:
- - media
-icon_url: https://truecharts.org/_static/img/jackett-icon.png
diff --git a/stable/home-assistant/3.1.5/templates/common.yaml b/stable/jackett/templates/common.yaml
similarity index 100%
rename from stable/home-assistant/3.1.5/templates/common.yaml
rename to stable/jackett/templates/common.yaml
diff --git a/.test/jackett/values.yaml b/stable/jackett/values.yaml
similarity index 100%
rename from .test/jackett/values.yaml
rename to stable/jackett/values.yaml
diff --git a/stable/home-assistant/3.1.5/.helmignore b/stable/jellyfin/.helmignore
similarity index 100%
rename from stable/home-assistant/3.1.5/.helmignore
rename to stable/jellyfin/.helmignore
diff --git a/stable/jellyfin/3.1.5/Chart.lock b/stable/jellyfin/3.1.5/Chart.lock
deleted file mode 100644
index 8d4cfe6243a..00000000000
--- a/stable/jellyfin/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:54.90973838Z"
diff --git a/stable/jellyfin/3.1.5/charts/common-3.5.5.tgz b/stable/jellyfin/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/jellyfin/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/jellyfin/3.1.5/values.yaml b/stable/jellyfin/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/jellyfin/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/jackett/3.1.5/CONFIG.md b/stable/jellyfin/CONFIG.md
similarity index 100%
rename from stable/jackett/3.1.5/CONFIG.md
rename to stable/jellyfin/CONFIG.md
diff --git a/stable/jellyfin/3.1.5/Chart.yaml b/stable/jellyfin/Chart.yaml
similarity index 100%
rename from stable/jellyfin/3.1.5/Chart.yaml
rename to stable/jellyfin/Chart.yaml
diff --git a/stable/jellyfin/3.1.5/README.md b/stable/jellyfin/README.md
similarity index 100%
rename from stable/jellyfin/3.1.5/README.md
rename to stable/jellyfin/README.md
diff --git a/stable/jellyfin/item.yaml b/stable/jellyfin/SCALE/item.yaml
similarity index 100%
rename from stable/jellyfin/item.yaml
rename to stable/jellyfin/SCALE/item.yaml
diff --git a/stable/jellyfin/3.1.5/ix_values.yaml b/stable/jellyfin/SCALE/ix_values.yaml
similarity index 100%
rename from stable/jellyfin/3.1.5/ix_values.yaml
rename to stable/jellyfin/SCALE/ix_values.yaml
diff --git a/stable/jellyfin/3.1.5/questions.yaml b/stable/jellyfin/SCALE/questions.yaml
similarity index 100%
rename from stable/jellyfin/3.1.5/questions.yaml
rename to stable/jellyfin/SCALE/questions.yaml
diff --git a/stable/jellyfin/3.1.5/app-readme.md b/stable/jellyfin/app-readme.md
similarity index 100%
rename from stable/jellyfin/3.1.5/app-readme.md
rename to stable/jellyfin/app-readme.md
diff --git a/stable/jackett/3.1.5/templates/common.yaml b/stable/jellyfin/templates/common.yaml
similarity index 100%
rename from stable/jackett/3.1.5/templates/common.yaml
rename to stable/jellyfin/templates/common.yaml
diff --git a/stable/jellyfin/3.1.5/test_values.yaml b/stable/jellyfin/values.yaml
similarity index 100%
rename from stable/jellyfin/3.1.5/test_values.yaml
rename to stable/jellyfin/values.yaml
diff --git a/stable/jackett/3.1.5/.helmignore b/stable/kms/.helmignore
similarity index 100%
rename from stable/jackett/3.1.5/.helmignore
rename to stable/kms/.helmignore
diff --git a/stable/kms/3.1.5/Chart.lock b/stable/kms/3.1.5/Chart.lock
deleted file mode 100644
index cb39e09bd6c..00000000000
--- a/stable/kms/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:52.523758381Z"
diff --git a/stable/kms/3.1.5/charts/common-3.5.5.tgz b/stable/kms/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/kms/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/kms/3.1.5/values.yaml b/stable/kms/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/kms/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/jellyfin/3.1.5/CONFIG.md b/stable/kms/CONFIG.md
similarity index 100%
rename from stable/jellyfin/3.1.5/CONFIG.md
rename to stable/kms/CONFIG.md
diff --git a/stable/kms/3.1.5/Chart.yaml b/stable/kms/Chart.yaml
similarity index 100%
rename from stable/kms/3.1.5/Chart.yaml
rename to stable/kms/Chart.yaml
diff --git a/stable/kms/3.1.5/README.md b/stable/kms/README.md
similarity index 100%
rename from stable/kms/3.1.5/README.md
rename to stable/kms/README.md
diff --git a/stable/kms/item.yaml b/stable/kms/SCALE/item.yaml
similarity index 100%
rename from stable/kms/item.yaml
rename to stable/kms/SCALE/item.yaml
diff --git a/stable/kms/3.1.5/ix_values.yaml b/stable/kms/SCALE/ix_values.yaml
similarity index 100%
rename from stable/kms/3.1.5/ix_values.yaml
rename to stable/kms/SCALE/ix_values.yaml
diff --git a/stable/kms/3.1.5/questions.yaml b/stable/kms/SCALE/questions.yaml
similarity index 100%
rename from stable/kms/3.1.5/questions.yaml
rename to stable/kms/SCALE/questions.yaml
diff --git a/stable/kms/3.1.5/app-readme.md b/stable/kms/app-readme.md
similarity index 100%
rename from stable/kms/3.1.5/app-readme.md
rename to stable/kms/app-readme.md
diff --git a/stable/jellyfin/3.1.5/templates/common.yaml b/stable/kms/templates/common.yaml
similarity index 100%
rename from stable/jellyfin/3.1.5/templates/common.yaml
rename to stable/kms/templates/common.yaml
diff --git a/stable/kms/3.1.5/test_values.yaml b/stable/kms/values.yaml
similarity index 100%
rename from stable/kms/3.1.5/test_values.yaml
rename to stable/kms/values.yaml
diff --git a/stable/jellyfin/3.1.5/.helmignore b/stable/lidarr/.helmignore
similarity index 100%
rename from stable/jellyfin/3.1.5/.helmignore
rename to stable/lidarr/.helmignore
diff --git a/stable/lidarr/3.1.5/Chart.lock b/stable/lidarr/3.1.5/Chart.lock
deleted file mode 100644
index 412e6416e4f..00000000000
--- a/stable/lidarr/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:50.064917741Z"
diff --git a/stable/lidarr/3.1.5/charts/common-3.5.5.tgz b/stable/lidarr/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/lidarr/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/lidarr/3.1.5/values.yaml b/stable/lidarr/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/lidarr/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/kms/3.1.5/CONFIG.md b/stable/lidarr/CONFIG.md
similarity index 100%
rename from stable/kms/3.1.5/CONFIG.md
rename to stable/lidarr/CONFIG.md
diff --git a/stable/lidarr/3.1.5/Chart.yaml b/stable/lidarr/Chart.yaml
similarity index 100%
rename from stable/lidarr/3.1.5/Chart.yaml
rename to stable/lidarr/Chart.yaml
diff --git a/stable/lidarr/3.1.5/README.md b/stable/lidarr/README.md
similarity index 100%
rename from stable/lidarr/3.1.5/README.md
rename to stable/lidarr/README.md
diff --git a/stable/lidarr/item.yaml b/stable/lidarr/SCALE/item.yaml
similarity index 100%
rename from stable/lidarr/item.yaml
rename to stable/lidarr/SCALE/item.yaml
diff --git a/stable/lidarr/3.1.5/ix_values.yaml b/stable/lidarr/SCALE/ix_values.yaml
similarity index 100%
rename from stable/lidarr/3.1.5/ix_values.yaml
rename to stable/lidarr/SCALE/ix_values.yaml
diff --git a/stable/lidarr/3.1.5/questions.yaml b/stable/lidarr/SCALE/questions.yaml
similarity index 100%
rename from stable/lidarr/3.1.5/questions.yaml
rename to stable/lidarr/SCALE/questions.yaml
diff --git a/stable/lidarr/3.1.5/app-readme.md b/stable/lidarr/app-readme.md
similarity index 100%
rename from stable/lidarr/3.1.5/app-readme.md
rename to stable/lidarr/app-readme.md
diff --git a/stable/kms/3.1.5/templates/common.yaml b/stable/lidarr/templates/common.yaml
similarity index 100%
rename from stable/kms/3.1.5/templates/common.yaml
rename to stable/lidarr/templates/common.yaml
diff --git a/stable/lidarr/3.1.5/test_values.yaml b/stable/lidarr/values.yaml
similarity index 100%
rename from stable/lidarr/3.1.5/test_values.yaml
rename to stable/lidarr/values.yaml
diff --git a/stable/kms/3.1.5/.helmignore b/stable/ombi/.helmignore
similarity index 100%
rename from stable/kms/3.1.5/.helmignore
rename to stable/ombi/.helmignore
diff --git a/stable/ombi/3.1.5/Chart.lock b/stable/ombi/3.1.5/Chart.lock
deleted file mode 100644
index 281d6eefae5..00000000000
--- a/stable/ombi/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:47.656610763Z"
diff --git a/stable/ombi/3.1.5/charts/common-3.5.5.tgz b/stable/ombi/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/ombi/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/ombi/3.1.5/values.yaml b/stable/ombi/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/ombi/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/lidarr/3.1.5/CONFIG.md b/stable/ombi/CONFIG.md
similarity index 100%
rename from stable/lidarr/3.1.5/CONFIG.md
rename to stable/ombi/CONFIG.md
diff --git a/stable/ombi/3.1.5/Chart.yaml b/stable/ombi/Chart.yaml
similarity index 100%
rename from stable/ombi/3.1.5/Chart.yaml
rename to stable/ombi/Chart.yaml
diff --git a/stable/ombi/3.1.5/README.md b/stable/ombi/README.md
similarity index 100%
rename from stable/ombi/3.1.5/README.md
rename to stable/ombi/README.md
diff --git a/stable/ombi/item.yaml b/stable/ombi/SCALE/item.yaml
similarity index 100%
rename from stable/ombi/item.yaml
rename to stable/ombi/SCALE/item.yaml
diff --git a/stable/ombi/3.1.5/ix_values.yaml b/stable/ombi/SCALE/ix_values.yaml
similarity index 100%
rename from stable/ombi/3.1.5/ix_values.yaml
rename to stable/ombi/SCALE/ix_values.yaml
diff --git a/stable/ombi/3.1.5/questions.yaml b/stable/ombi/SCALE/questions.yaml
similarity index 100%
rename from stable/ombi/3.1.5/questions.yaml
rename to stable/ombi/SCALE/questions.yaml
diff --git a/stable/ombi/3.1.5/app-readme.md b/stable/ombi/app-readme.md
similarity index 100%
rename from stable/ombi/3.1.5/app-readme.md
rename to stable/ombi/app-readme.md
diff --git a/stable/lidarr/3.1.5/templates/common.yaml b/stable/ombi/templates/common.yaml
similarity index 100%
rename from stable/lidarr/3.1.5/templates/common.yaml
rename to stable/ombi/templates/common.yaml
diff --git a/stable/ombi/3.1.5/test_values.yaml b/stable/ombi/values.yaml
similarity index 100%
rename from stable/ombi/3.1.5/test_values.yaml
rename to stable/ombi/values.yaml
diff --git a/stable/lidarr/3.1.5/.helmignore b/stable/plex/.helmignore
similarity index 100%
rename from stable/lidarr/3.1.5/.helmignore
rename to stable/plex/.helmignore
diff --git a/stable/plex/2.1.5/Chart.lock b/stable/plex/2.1.5/Chart.lock
deleted file mode 100644
index 451eeba37da..00000000000
--- a/stable/plex/2.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:44.991231552Z"
diff --git a/stable/plex/2.1.5/charts/common-3.5.5.tgz b/stable/plex/2.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/plex/2.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/plex/2.1.5/values.yaml b/stable/plex/2.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/plex/2.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/ombi/3.1.5/CONFIG.md b/stable/plex/CONFIG.md
similarity index 100%
rename from stable/ombi/3.1.5/CONFIG.md
rename to stable/plex/CONFIG.md
diff --git a/stable/plex/2.1.5/Chart.yaml b/stable/plex/Chart.yaml
similarity index 100%
rename from stable/plex/2.1.5/Chart.yaml
rename to stable/plex/Chart.yaml
diff --git a/stable/plex/2.1.5/README.md b/stable/plex/README.md
similarity index 100%
rename from stable/plex/2.1.5/README.md
rename to stable/plex/README.md
diff --git a/stable/plex/item.yaml b/stable/plex/SCALE/item.yaml
similarity index 100%
rename from stable/plex/item.yaml
rename to stable/plex/SCALE/item.yaml
diff --git a/stable/plex/2.1.5/ix_values.yaml b/stable/plex/SCALE/ix_values.yaml
similarity index 100%
rename from stable/plex/2.1.5/ix_values.yaml
rename to stable/plex/SCALE/ix_values.yaml
diff --git a/stable/plex/2.1.5/questions.yaml b/stable/plex/SCALE/questions.yaml
similarity index 100%
rename from stable/plex/2.1.5/questions.yaml
rename to stable/plex/SCALE/questions.yaml
diff --git a/stable/plex/2.1.5/app-readme.md b/stable/plex/app-readme.md
similarity index 100%
rename from stable/plex/2.1.5/app-readme.md
rename to stable/plex/app-readme.md
diff --git a/stable/ombi/3.1.5/templates/common.yaml b/stable/plex/templates/common.yaml
similarity index 100%
rename from stable/ombi/3.1.5/templates/common.yaml
rename to stable/plex/templates/common.yaml
diff --git a/stable/plex/2.1.5/test_values.yaml b/stable/plex/values.yaml
similarity index 100%
rename from stable/plex/2.1.5/test_values.yaml
rename to stable/plex/values.yaml
diff --git a/stable/ombi/3.1.5/.helmignore b/stable/radarr/.helmignore
similarity index 100%
rename from stable/ombi/3.1.5/.helmignore
rename to stable/radarr/.helmignore
diff --git a/stable/radarr/3.1.5/Chart.lock b/stable/radarr/3.1.5/Chart.lock
deleted file mode 100644
index e526c85bd7b..00000000000
--- a/stable/radarr/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:42.279165655Z"
diff --git a/stable/radarr/3.1.5/charts/common-3.5.5.tgz b/stable/radarr/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/radarr/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/radarr/3.1.5/values.yaml b/stable/radarr/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/radarr/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/plex/2.1.5/CONFIG.md b/stable/radarr/CONFIG.md
similarity index 100%
rename from stable/plex/2.1.5/CONFIG.md
rename to stable/radarr/CONFIG.md
diff --git a/stable/radarr/3.1.5/Chart.yaml b/stable/radarr/Chart.yaml
similarity index 100%
rename from stable/radarr/3.1.5/Chart.yaml
rename to stable/radarr/Chart.yaml
diff --git a/stable/radarr/3.1.5/README.md b/stable/radarr/README.md
similarity index 100%
rename from stable/radarr/3.1.5/README.md
rename to stable/radarr/README.md
diff --git a/stable/radarr/item.yaml b/stable/radarr/SCALE/item.yaml
similarity index 100%
rename from stable/radarr/item.yaml
rename to stable/radarr/SCALE/item.yaml
diff --git a/stable/radarr/3.1.5/ix_values.yaml b/stable/radarr/SCALE/ix_values.yaml
similarity index 100%
rename from stable/radarr/3.1.5/ix_values.yaml
rename to stable/radarr/SCALE/ix_values.yaml
diff --git a/stable/radarr/3.1.5/questions.yaml b/stable/radarr/SCALE/questions.yaml
similarity index 100%
rename from stable/radarr/3.1.5/questions.yaml
rename to stable/radarr/SCALE/questions.yaml
diff --git a/stable/radarr/3.1.5/app-readme.md b/stable/radarr/app-readme.md
similarity index 100%
rename from stable/radarr/3.1.5/app-readme.md
rename to stable/radarr/app-readme.md
diff --git a/stable/plex/2.1.5/templates/common.yaml b/stable/radarr/templates/common.yaml
similarity index 100%
rename from stable/plex/2.1.5/templates/common.yaml
rename to stable/radarr/templates/common.yaml
diff --git a/stable/radarr/3.1.5/test_values.yaml b/stable/radarr/values.yaml
similarity index 100%
rename from stable/radarr/3.1.5/test_values.yaml
rename to stable/radarr/values.yaml
diff --git a/stable/plex/2.1.5/.helmignore b/stable/sonarr/.helmignore
similarity index 100%
rename from stable/plex/2.1.5/.helmignore
rename to stable/sonarr/.helmignore
diff --git a/stable/sonarr/3.1.5/Chart.lock b/stable/sonarr/3.1.5/Chart.lock
deleted file mode 100644
index b946c11df34..00000000000
--- a/stable/sonarr/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:39.944105682Z"
diff --git a/stable/sonarr/3.1.5/charts/common-3.5.5.tgz b/stable/sonarr/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/sonarr/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/sonarr/3.1.5/values.yaml b/stable/sonarr/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/sonarr/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/radarr/3.1.5/CONFIG.md b/stable/sonarr/CONFIG.md
similarity index 100%
rename from stable/radarr/3.1.5/CONFIG.md
rename to stable/sonarr/CONFIG.md
diff --git a/stable/sonarr/3.1.5/Chart.yaml b/stable/sonarr/Chart.yaml
similarity index 100%
rename from stable/sonarr/3.1.5/Chart.yaml
rename to stable/sonarr/Chart.yaml
diff --git a/stable/sonarr/3.1.5/README.md b/stable/sonarr/README.md
similarity index 100%
rename from stable/sonarr/3.1.5/README.md
rename to stable/sonarr/README.md
diff --git a/stable/sonarr/item.yaml b/stable/sonarr/SCALE/item.yaml
similarity index 100%
rename from stable/sonarr/item.yaml
rename to stable/sonarr/SCALE/item.yaml
diff --git a/stable/sonarr/3.1.5/ix_values.yaml b/stable/sonarr/SCALE/ix_values.yaml
similarity index 100%
rename from stable/sonarr/3.1.5/ix_values.yaml
rename to stable/sonarr/SCALE/ix_values.yaml
diff --git a/stable/sonarr/3.1.5/questions.yaml b/stable/sonarr/SCALE/questions.yaml
similarity index 100%
rename from stable/sonarr/3.1.5/questions.yaml
rename to stable/sonarr/SCALE/questions.yaml
diff --git a/stable/sonarr/3.1.5/app-readme.md b/stable/sonarr/app-readme.md
similarity index 100%
rename from stable/sonarr/3.1.5/app-readme.md
rename to stable/sonarr/app-readme.md
diff --git a/stable/radarr/3.1.5/templates/common.yaml b/stable/sonarr/templates/common.yaml
similarity index 100%
rename from stable/radarr/3.1.5/templates/common.yaml
rename to stable/sonarr/templates/common.yaml
diff --git a/stable/sonarr/3.1.5/test_values.yaml b/stable/sonarr/values.yaml
similarity index 100%
rename from stable/sonarr/3.1.5/test_values.yaml
rename to stable/sonarr/values.yaml
diff --git a/stable/radarr/3.1.5/.helmignore b/stable/syncthing/.helmignore
similarity index 100%
rename from stable/radarr/3.1.5/.helmignore
rename to stable/syncthing/.helmignore
diff --git a/stable/syncthing/3.1.5/Chart.lock b/stable/syncthing/3.1.5/Chart.lock
deleted file mode 100644
index 52589e80c62..00000000000
--- a/stable/syncthing/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:37.507008865Z"
diff --git a/stable/syncthing/3.1.5/charts/common-3.5.5.tgz b/stable/syncthing/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/syncthing/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/syncthing/3.1.5/values.yaml b/stable/syncthing/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/syncthing/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/sonarr/3.1.5/CONFIG.md b/stable/syncthing/CONFIG.md
similarity index 100%
rename from stable/sonarr/3.1.5/CONFIG.md
rename to stable/syncthing/CONFIG.md
diff --git a/stable/syncthing/3.1.5/Chart.yaml b/stable/syncthing/Chart.yaml
similarity index 100%
rename from stable/syncthing/3.1.5/Chart.yaml
rename to stable/syncthing/Chart.yaml
diff --git a/stable/syncthing/3.1.5/README.md b/stable/syncthing/README.md
similarity index 100%
rename from stable/syncthing/3.1.5/README.md
rename to stable/syncthing/README.md
diff --git a/stable/syncthing/item.yaml b/stable/syncthing/SCALE/item.yaml
similarity index 100%
rename from stable/syncthing/item.yaml
rename to stable/syncthing/SCALE/item.yaml
diff --git a/stable/syncthing/3.1.5/ix_values.yaml b/stable/syncthing/SCALE/ix_values.yaml
similarity index 100%
rename from stable/syncthing/3.1.5/ix_values.yaml
rename to stable/syncthing/SCALE/ix_values.yaml
diff --git a/stable/syncthing/3.1.5/questions.yaml b/stable/syncthing/SCALE/questions.yaml
similarity index 100%
rename from stable/syncthing/3.1.5/questions.yaml
rename to stable/syncthing/SCALE/questions.yaml
diff --git a/stable/syncthing/3.1.5/app-readme.md b/stable/syncthing/app-readme.md
similarity index 100%
rename from stable/syncthing/3.1.5/app-readme.md
rename to stable/syncthing/app-readme.md
diff --git a/stable/sonarr/3.1.5/templates/common.yaml b/stable/syncthing/templates/common.yaml
similarity index 100%
rename from stable/sonarr/3.1.5/templates/common.yaml
rename to stable/syncthing/templates/common.yaml
diff --git a/stable/syncthing/3.1.5/test_values.yaml b/stable/syncthing/values.yaml
similarity index 100%
rename from stable/syncthing/3.1.5/test_values.yaml
rename to stable/syncthing/values.yaml
diff --git a/stable/sonarr/3.1.5/.helmignore b/stable/tautulli/.helmignore
similarity index 100%
rename from stable/sonarr/3.1.5/.helmignore
rename to stable/tautulli/.helmignore
diff --git a/stable/tautulli/3.1.5/.helmignore b/stable/tautulli/3.1.5/.helmignore
deleted file mode 100644
index e559de0a012..00000000000
--- a/stable/tautulli/3.1.5/.helmignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-# OWNERS file for Kubernetes
-OWNERS
diff --git a/stable/tautulli/3.1.5/Chart.lock b/stable/tautulli/3.1.5/Chart.lock
deleted file mode 100644
index de5c885aaba..00000000000
--- a/stable/tautulli/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:35.003395591Z"
diff --git a/stable/tautulli/3.1.5/charts/common-3.5.5.tgz b/stable/tautulli/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/tautulli/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/tautulli/3.1.5/values.yaml b/stable/tautulli/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/tautulli/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/syncthing/3.1.5/CONFIG.md b/stable/tautulli/CONFIG.md
similarity index 100%
rename from stable/syncthing/3.1.5/CONFIG.md
rename to stable/tautulli/CONFIG.md
diff --git a/stable/tautulli/3.1.5/Chart.yaml b/stable/tautulli/Chart.yaml
similarity index 100%
rename from stable/tautulli/3.1.5/Chart.yaml
rename to stable/tautulli/Chart.yaml
diff --git a/stable/tautulli/3.1.5/README.md b/stable/tautulli/README.md
similarity index 100%
rename from stable/tautulli/3.1.5/README.md
rename to stable/tautulli/README.md
diff --git a/stable/tautulli/item.yaml b/stable/tautulli/SCALE/item.yaml
similarity index 100%
rename from stable/tautulli/item.yaml
rename to stable/tautulli/SCALE/item.yaml
diff --git a/stable/tautulli/3.1.5/ix_values.yaml b/stable/tautulli/SCALE/ix_values.yaml
similarity index 100%
rename from stable/tautulli/3.1.5/ix_values.yaml
rename to stable/tautulli/SCALE/ix_values.yaml
diff --git a/stable/tautulli/3.1.5/questions.yaml b/stable/tautulli/SCALE/questions.yaml
similarity index 100%
rename from stable/tautulli/3.1.5/questions.yaml
rename to stable/tautulli/SCALE/questions.yaml
diff --git a/stable/tautulli/3.1.5/app-readme.md b/stable/tautulli/app-readme.md
similarity index 100%
rename from stable/tautulli/3.1.5/app-readme.md
rename to stable/tautulli/app-readme.md
diff --git a/stable/syncthing/3.1.5/templates/common.yaml b/stable/tautulli/templates/common.yaml
similarity index 100%
rename from stable/syncthing/3.1.5/templates/common.yaml
rename to stable/tautulli/templates/common.yaml
diff --git a/stable/tautulli/3.1.5/test_values.yaml b/stable/tautulli/values.yaml
similarity index 100%
rename from stable/tautulli/3.1.5/test_values.yaml
rename to stable/tautulli/values.yaml
diff --git a/stable/traefik/3.2.3/.helmignore b/stable/traefik/.helmignore
similarity index 100%
rename from stable/traefik/3.2.3/.helmignore
rename to stable/traefik/.helmignore
diff --git a/stable/traefik/3.2.3/Chart.lock b/stable/traefik/3.2.3/Chart.lock
deleted file mode 100644
index 28745fa2abd..00000000000
--- a/stable/traefik/3.2.3/Chart.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-- name: traefik
- repository: https://helm.traefik.io/traefik
- version: 9.19.0
-digest: sha256:36e9220703d2e08d55b28c3cf34a8d0a0e85bfdc089b88e9b875522f1410b85b
-generated: "2021-05-04T15:26:31.164905891Z"
diff --git a/stable/traefik/3.2.3/charts/common-3.5.5.tgz b/stable/traefik/3.2.3/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/traefik/3.2.3/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/traefik/3.2.3/charts/traefik-9.19.0.tgz b/stable/traefik/3.2.3/charts/traefik-9.19.0.tgz
deleted file mode 100644
index e13b38de248..00000000000
Binary files a/stable/traefik/3.2.3/charts/traefik-9.19.0.tgz and /dev/null differ
diff --git a/stable/traefik/3.2.3/values.yaml b/stable/traefik/3.2.3/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/traefik/3.2.3/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/tautulli/3.1.5/CONFIG.md b/stable/traefik/CONFIG.md
similarity index 100%
rename from stable/tautulli/3.1.5/CONFIG.md
rename to stable/traefik/CONFIG.md
diff --git a/stable/traefik/3.2.3/Chart.yaml b/stable/traefik/Chart.yaml
similarity index 100%
rename from stable/traefik/3.2.3/Chart.yaml
rename to stable/traefik/Chart.yaml
diff --git a/stable/traefik/3.2.3/Guidelines.md b/stable/traefik/Guidelines.md
similarity index 100%
rename from stable/traefik/3.2.3/Guidelines.md
rename to stable/traefik/Guidelines.md
diff --git a/stable/traefik/3.2.3/README.md b/stable/traefik/README.md
similarity index 100%
rename from stable/traefik/3.2.3/README.md
rename to stable/traefik/README.md
diff --git a/stable/traefik/item.yaml b/stable/traefik/SCALE/item.yaml
similarity index 100%
rename from stable/traefik/item.yaml
rename to stable/traefik/SCALE/item.yaml
diff --git a/stable/traefik/3.2.3/ix_values.yaml b/stable/traefik/SCALE/ix_values.yaml
similarity index 100%
rename from stable/traefik/3.2.3/ix_values.yaml
rename to stable/traefik/SCALE/ix_values.yaml
diff --git a/stable/traefik/3.2.3/questions.yaml b/stable/traefik/SCALE/questions.yaml
similarity index 100%
rename from stable/traefik/3.2.3/questions.yaml
rename to stable/traefik/SCALE/questions.yaml
diff --git a/stable/traefik/3.2.3/app-readme.md b/stable/traefik/app-readme.md
similarity index 100%
rename from stable/traefik/3.2.3/app-readme.md
rename to stable/traefik/app-readme.md
diff --git a/stable/traefik/3.2.3/crds/ingressroute.yaml b/stable/traefik/crds/ingressroute.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/ingressroute.yaml
rename to stable/traefik/crds/ingressroute.yaml
diff --git a/stable/traefik/3.2.3/crds/ingressroutetcp.yaml b/stable/traefik/crds/ingressroutetcp.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/ingressroutetcp.yaml
rename to stable/traefik/crds/ingressroutetcp.yaml
diff --git a/stable/traefik/3.2.3/crds/ingressrouteudp.yaml b/stable/traefik/crds/ingressrouteudp.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/ingressrouteudp.yaml
rename to stable/traefik/crds/ingressrouteudp.yaml
diff --git a/stable/traefik/3.2.3/crds/middlewares.yaml b/stable/traefik/crds/middlewares.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/middlewares.yaml
rename to stable/traefik/crds/middlewares.yaml
diff --git a/stable/traefik/3.2.3/crds/serverstransports.yaml b/stable/traefik/crds/serverstransports.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/serverstransports.yaml
rename to stable/traefik/crds/serverstransports.yaml
diff --git a/stable/traefik/3.2.3/crds/tlsoptions.yaml b/stable/traefik/crds/tlsoptions.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/tlsoptions.yaml
rename to stable/traefik/crds/tlsoptions.yaml
diff --git a/stable/traefik/3.2.3/crds/tlsstores.yaml b/stable/traefik/crds/tlsstores.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/tlsstores.yaml
rename to stable/traefik/crds/tlsstores.yaml
diff --git a/stable/traefik/3.2.3/crds/traefikservices.yaml b/stable/traefik/crds/traefikservices.yaml
similarity index 100%
rename from stable/traefik/3.2.3/crds/traefikservices.yaml
rename to stable/traefik/crds/traefikservices.yaml
diff --git a/stable/traefik/3.2.3/templates/common.yaml b/stable/traefik/templates/common.yaml
similarity index 100%
rename from stable/traefik/3.2.3/templates/common.yaml
rename to stable/traefik/templates/common.yaml
diff --git a/stable/traefik/3.2.3/templates/middlewares.yaml b/stable/traefik/templates/middlewares.yaml
similarity index 100%
rename from stable/traefik/3.2.3/templates/middlewares.yaml
rename to stable/traefik/templates/middlewares.yaml
diff --git a/stable/traefik/3.2.3/templates/tlsoptions.yaml b/stable/traefik/templates/tlsoptions.yaml
similarity index 100%
rename from stable/traefik/3.2.3/templates/tlsoptions.yaml
rename to stable/traefik/templates/tlsoptions.yaml
diff --git a/stable/traefik/3.2.3/test_values.yaml b/stable/traefik/values.yaml
similarity index 100%
rename from stable/traefik/3.2.3/test_values.yaml
rename to stable/traefik/values.yaml
diff --git a/stable/syncthing/3.1.5/.helmignore b/stable/transmission/.helmignore
similarity index 100%
rename from stable/syncthing/3.1.5/.helmignore
rename to stable/transmission/.helmignore
diff --git a/stable/transmission/3.1.5/.helmignore b/stable/transmission/3.1.5/.helmignore
deleted file mode 100644
index e559de0a012..00000000000
--- a/stable/transmission/3.1.5/.helmignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-# OWNERS file for Kubernetes
-OWNERS
diff --git a/stable/transmission/3.1.5/Chart.lock b/stable/transmission/3.1.5/Chart.lock
deleted file mode 100644
index 3b6328517b8..00000000000
--- a/stable/transmission/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:28.220397747Z"
diff --git a/stable/transmission/3.1.5/charts/common-3.5.5.tgz b/stable/transmission/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/transmission/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/transmission/3.1.5/values.yaml b/stable/transmission/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/transmission/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/traefik/3.2.3/CONFIG.md b/stable/transmission/CONFIG.md
similarity index 100%
rename from stable/traefik/3.2.3/CONFIG.md
rename to stable/transmission/CONFIG.md
diff --git a/stable/transmission/3.1.5/Chart.yaml b/stable/transmission/Chart.yaml
similarity index 100%
rename from stable/transmission/3.1.5/Chart.yaml
rename to stable/transmission/Chart.yaml
diff --git a/stable/transmission/3.1.5/README.md b/stable/transmission/README.md
similarity index 100%
rename from stable/transmission/3.1.5/README.md
rename to stable/transmission/README.md
diff --git a/stable/transmission/item.yaml b/stable/transmission/SCALE/item.yaml
similarity index 100%
rename from stable/transmission/item.yaml
rename to stable/transmission/SCALE/item.yaml
diff --git a/stable/transmission/3.1.5/ix_values.yaml b/stable/transmission/SCALE/ix_values.yaml
similarity index 100%
rename from stable/transmission/3.1.5/ix_values.yaml
rename to stable/transmission/SCALE/ix_values.yaml
diff --git a/stable/transmission/3.1.5/questions.yaml b/stable/transmission/SCALE/questions.yaml
similarity index 100%
rename from stable/transmission/3.1.5/questions.yaml
rename to stable/transmission/SCALE/questions.yaml
diff --git a/stable/transmission/3.1.5/app-readme.md b/stable/transmission/app-readme.md
similarity index 100%
rename from stable/transmission/3.1.5/app-readme.md
rename to stable/transmission/app-readme.md
diff --git a/stable/transmission/3.1.5/templates/common.yaml b/stable/transmission/templates/common.yaml
similarity index 100%
rename from stable/transmission/3.1.5/templates/common.yaml
rename to stable/transmission/templates/common.yaml
diff --git a/stable/transmission/3.1.5/templates/configmap.yaml b/stable/transmission/templates/configmap.yaml
similarity index 100%
rename from stable/transmission/3.1.5/templates/configmap.yaml
rename to stable/transmission/templates/configmap.yaml
diff --git a/stable/transmission/3.1.5/test_values.yaml b/stable/transmission/values.yaml
similarity index 100%
rename from stable/transmission/3.1.5/test_values.yaml
rename to stable/transmission/values.yaml
diff --git a/stable/zwavejs2mqtt/3.1.5/.helmignore b/stable/zwavejs2mqtt/.helmignore
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/.helmignore
rename to stable/zwavejs2mqtt/.helmignore
diff --git a/stable/zwavejs2mqtt/3.1.5/CONFIG.md b/stable/zwavejs2mqtt/3.1.5/CONFIG.md
deleted file mode 100644
index 6d760c18421..00000000000
--- a/stable/zwavejs2mqtt/3.1.5/CONFIG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration Options
-
-##### Connecting to other apps
-If you need to connect this App to other Apps on TrueNAS SCALE, please refer to our "Linking Apps Together" guide:
-https://truecharts.org/manual/linking/
-
-##### Available config options
-In the future this page is going to contain an automated list of options available in the installation/edit UI.
diff --git a/stable/zwavejs2mqtt/3.1.5/Chart.lock b/stable/zwavejs2mqtt/3.1.5/Chart.lock
deleted file mode 100644
index 145d37c1deb..00000000000
--- a/stable/zwavejs2mqtt/3.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org/
- version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:26:24.84097897Z"
diff --git a/stable/zwavejs2mqtt/3.1.5/charts/common-3.5.5.tgz b/stable/zwavejs2mqtt/3.1.5/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/stable/zwavejs2mqtt/3.1.5/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/stable/zwavejs2mqtt/3.1.5/templates/common.yaml b/stable/zwavejs2mqtt/3.1.5/templates/common.yaml
deleted file mode 100644
index a6613c2ce21..00000000000
--- a/stable/zwavejs2mqtt/3.1.5/templates/common.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{ include "common.all" . }}
diff --git a/stable/zwavejs2mqtt/3.1.5/values.yaml b/stable/zwavejs2mqtt/3.1.5/values.yaml
deleted file mode 100644
index 58eb9c684b0..00000000000
--- a/stable/zwavejs2mqtt/3.1.5/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/stable/transmission/3.1.5/CONFIG.md b/stable/zwavejs2mqtt/CONFIG.md
similarity index 100%
rename from stable/transmission/3.1.5/CONFIG.md
rename to stable/zwavejs2mqtt/CONFIG.md
diff --git a/stable/zwavejs2mqtt/3.1.5/Chart.yaml b/stable/zwavejs2mqtt/Chart.yaml
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/Chart.yaml
rename to stable/zwavejs2mqtt/Chart.yaml
diff --git a/stable/zwavejs2mqtt/3.1.5/README.md b/stable/zwavejs2mqtt/README.md
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/README.md
rename to stable/zwavejs2mqtt/README.md
diff --git a/stable/zwavejs2mqtt/item.yaml b/stable/zwavejs2mqtt/SCALE/item.yaml
similarity index 100%
rename from stable/zwavejs2mqtt/item.yaml
rename to stable/zwavejs2mqtt/SCALE/item.yaml
diff --git a/stable/zwavejs2mqtt/3.1.5/ix_values.yaml b/stable/zwavejs2mqtt/SCALE/ix_values.yaml
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/ix_values.yaml
rename to stable/zwavejs2mqtt/SCALE/ix_values.yaml
diff --git a/stable/zwavejs2mqtt/3.1.5/questions.yaml b/stable/zwavejs2mqtt/SCALE/questions.yaml
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/questions.yaml
rename to stable/zwavejs2mqtt/SCALE/questions.yaml
diff --git a/stable/zwavejs2mqtt/3.1.5/app-readme.md b/stable/zwavejs2mqtt/app-readme.md
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/app-readme.md
rename to stable/zwavejs2mqtt/app-readme.md
diff --git a/stable/tautulli/3.1.5/templates/common.yaml b/stable/zwavejs2mqtt/templates/common.yaml
similarity index 100%
rename from stable/tautulli/3.1.5/templates/common.yaml
rename to stable/zwavejs2mqtt/templates/common.yaml
diff --git a/stable/zwavejs2mqtt/3.1.5/test_values.yaml b/stable/zwavejs2mqtt/values.yaml
similarity index 100%
rename from stable/zwavejs2mqtt/3.1.5/test_values.yaml
rename to stable/zwavejs2mqtt/values.yaml