diff --git a/.github/ct-install.yaml b/.github/ct-install.yaml
index 39e121e4e38..1e51a97080a 100644
--- a/.github/ct-install.yaml
+++ b/.github/ct-install.yaml
@@ -1,13 +1,36 @@
 remote: origin
 target-branch: master
-helm-extra-args: --timeout 240s
+helm-extra-args: --timeout 600s
 chart-yaml-schema: .github/chart_schema.yaml
+chart-dirs:
+- charts/incubator
+- charts/stable
+- charts/dependency
+- charts/core
+- charts/dev
+- charts/games
+- charts/enterprise
 excluded-charts:
-#- alertmanager-bot
+- charts/incubator/sdtd
+- charts/stable/alertmanager-bot
+- charts/stable/alertmanager-discord
+- charts/stable/amcrest2mqtt
+- charts/stable/facebox
+- charts/stable/foundryvtt
+- charts/stable/heimdall
+- charts/stable/multus
+- charts/stable/pod-gateway
+- charts/stable/promcord
+- charts/stable/reg
+- charts/stable/ser2sock
+- charts/stable/zalando-postgres-cluster
+- charts/stable/zigbee2mqtt
+- charts/stable/wireguard
+- charts/stable/alertmanager-bot
 - charts/incubator/amcrest2mqtt
 - charts/library/common
-#- foundryvtt
-- promcord
+- charts/stable/foundryvtt
+- charts/stable/promcord
 - charts/incubator/zigbee2mqtt
 chart-repos:
 - truecharts-old=https://truecharts.org
@@ -18,4 +41,9 @@ chart-repos:
 - metallb=https://metallb.github.io/metallb
 - grafana=https://grafana.github.io/helm-charts
 - prometheus=https://prometheus-community.github.io/helm-charts
+- k8s-at-home-libraries=https://library-charts.k8s-at-home.com
+- k8s-at-home=https://k8s-at-home.com/charts
+- jetstack=https://charts.jetstack.io
 SkipExisting: true
+skipExisting: true
+skipexisting: true
diff --git a/.github/ct-lint.yaml b/.github/ct-lint.yaml
index 39528e23dc9..ba17f1a8a7a 100644
--- a/.github/ct-lint.yaml
+++ b/.github/ct-lint.yaml
@@ -1,7 +1,16 @@
 remote: origin
 target-branch: master
-helm-extra-args: --timeout 600s
 chart-yaml-schema: .github/chart_schema.yaml
+helm-extra-args: --timeout 600s
+chart-dirs:
+- charts/incubator
+- charts/stable
+- charts/dependency
+- charts/core
+- charts/dev
+- charts/games
+- charts/enterprise
+excluded-charts:
 chart-repos:
 - truecharts-old=https://truecharts.org
 - truecharts=https://charts.truecharts.org
@@ -11,4 +20,6 @@ chart-repos:
 - metallb=https://metallb.github.io/metallb
 - grafana=https://grafana.github.io/helm-charts
 - prometheus=https://prometheus-community.github.io/helm-charts
-SkipExisting: true
+- k8s-at-home-libraries=https://library-charts.k8s-at-home.com
+- k8s-at-home=https://k8s-at-home.com/charts
+- jetstack=https://charts.jetstack.io