diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index 13c1cc974a3..2a45b772751 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -52,6 +52,25 @@ jobs:
               mv catalog/test/${chartname}/${maxchartversion}/item.yaml catalog/test/${chartname}/
             fi
           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
+              rm -rf ${path}/SCALE/templates
+              mv ${path}/values.yaml ${path}/test_values.yaml
+              touch ${path}/values.yaml
+              description=$(cat ${chart}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
+              echo "${description}" >> ${path}/app-readme.md
+            fi
+          done
       - name: Commit and Push new App releases
         run: |
           cd catalog
diff --git a/test/jackett/Chart.lock b/test/jackett/Chart.lock
deleted file mode 100644
index b0832134817..00000000000
--- a/test/jackett/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/test/jackett/Chart.yaml b/test/jackett/Chart.yaml
index f881c1789a6..d2dfd6dde9a 100644
--- a/test/jackett/Chart.yaml
+++ b/test/jackett/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: jackett
-version: 3.1.6
+version: 3.1.7
 upstream_version: 7.0.1
 appVersion: "auto"
 description: API Support for your favorite torrent trackers.
diff --git a/test/jackett/item.yaml b/test/jackett/SCALE/item.yaml
similarity index 100%
rename from test/jackett/item.yaml
rename to test/jackett/SCALE/item.yaml
diff --git a/test/jackett/ix_values.yaml b/test/jackett/SCALE/ix_values.yaml
similarity index 100%
rename from test/jackett/ix_values.yaml
rename to test/jackett/SCALE/ix_values.yaml
diff --git a/test/jackett/questions.yaml b/test/jackett/SCALE/questions.yaml
similarity index 100%
rename from test/jackett/questions.yaml
rename to test/jackett/SCALE/questions.yaml
diff --git a/test/jackett/app-readme.md b/test/jackett/app-readme.md
deleted file mode 100644
index 7d3c709fdff..00000000000
--- a/test/jackett/app-readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-API Support for your favorite torrent trackers.
-This App is supplied by TrueCharts, for more information please visit https://truecharts.org
diff --git a/test/jackett/charts/common-3.5.5.tgz b/test/jackett/charts/common-3.5.5.tgz
deleted file mode 100644
index d01688bb84b..00000000000
Binary files a/test/jackett/charts/common-3.5.5.tgz and /dev/null differ
diff --git a/test/jackett/test_values.yaml b/test/jackett/test_values.yaml
deleted file mode 100644
index 6202d8a3946..00000000000
--- a/test/jackett/test_values.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Default values for Jackett.
-
-image:
-  repository: ghcr.io/truecharts/jackett
-  pullPolicy: IfNotPresent
-  tag: v0.17.1006
-
-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/test/jackett/values.yaml b/test/jackett/values.yaml
index 58eb9c684b0..6202d8a3946 100644
--- a/test/jackett/values.yaml
+++ b/test/jackett/values.yaml
@@ -1 +1,46 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE
+# Default values for Jackett.
+
+image:
+  repository: ghcr.io/truecharts/jackett
+  pullPolicy: IfNotPresent
+  tag: v0.17.1006
+
+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: /