diff --git a/Dockerfile b/Dockerfile
index 29acd8bb..296bff9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,12 +56,12 @@ helm plugin install --version=v${HELM_LOCAL_CHART_VERSION_PLUGIN_VERSION} https:
 helm local-chart-version version
 EOF
 
-# Helm schema-gen plugin
-# renovate: datasource=github-releases depName=knechtionscoding/helm-schema-gen
-ARG HELM_SCHEMA_GEN_PLUGIN_VERSION=0.0.10
+# Helm schema plugin
+# renovate: datasource=github-releases depName=dadav/helm-schema
+ARG HELM_SCHEMA_GEN_PLUGIN_VERSION=0.16.1
 RUN <<EOF
-helm plugin install --version=v${HELM_SCHEMA_GEN_PLUGIN_VERSION} https://github.com/knechtionscoding/helm-schema-gen
-helm schema-gen --help
+helm plugin install --version=v${HELM_SCHEMA_GEN_PLUGIN_VERSION} https://github.com/dadav/helm-schema
+helm schema --help
 EOF
 
 # Chart Doc Gen
diff --git a/scripts/generate-schemas.sh b/scripts/generate-schemas.sh
index 152c62de..2ad6b8ea 100755
--- a/scripts/generate-schemas.sh
+++ b/scripts/generate-schemas.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euox pipefail
 
-echo "Running schema-gen..."
+echo "Running helm-schema..."
 
 CHARTS_DIR=${CHARTS_DIR:-"charts"}
 
@@ -13,6 +13,6 @@ for chart in "${CHARTS_DIR}"/*; do
     continue
   fi
 
-  helm schema-gen ${chart}/values.yaml >${chart}/values.schema.json
+  helm schema
 
 done