diff --git a/.ci/scripts/release.bash b/.ci/scripts/release.bash
index 05e5a60..4aa1105 100755
--- a/.ci/scripts/release.bash
+++ b/.ci/scripts/release.bash
@@ -34,8 +34,7 @@ function runUpdatecliDiff(){
   updatecli diff \
     --config "$POLICY_ROOT_DIR/updatecli.d" \
     --values "$POLICY_ROOT_DIR/values.yaml" \
-    --values "$POLICY_ROOT_DIR/testdata/values.yaml" \
-    --experimental
+    --values "$POLICY_ROOT_DIR/testdata/values.yaml"
 }
 
 function validateRequiredFile(){
@@ -119,6 +118,16 @@ function validateRequiredFile(){
     POLICY_ERROR=true
     echo "  * Changelog missing a version entry such as '## $versionInformation' in $POLICY_CHANGELOG"
   fi
+
+  # Testing that the latest changelog version is used in the Policy.yaml
+  latestVersionChangelogEntry=$( grep -r '## ' -m 1 "$POLICY_CHANGELOG")
+  latestVersionChangelogEntry=${latestVersionChangelogEntry#"## "}
+  if [[ "$latestVersionChangelogEntry" != "$versionInformation" ]]; then
+    POLICY_ERROR=true
+    echo "  * Latest Changelog version isn't the one used in Policy.yaml"
+    echo "      '## $latestVersionChangelogEntry' in $POLICY_CHANGELOG"
+    echo "      '## $versionInformation' in $POLICY_METADATA"
+  fi
 }
 
 function main(){
@@ -134,6 +143,14 @@ function main(){
     POLICY_ROOT_DIR=$(dirname "$POLICY")
     POLICY_ERROR=false
 
+    if [[ "$PARAM" == "--e2e-test" ]]; then
+      runUpdatecliDiff "$POLICY_ROOT_DIR"
+    fi
+
+    if [[ "$PARAM" == "--unit-test" ||  "$PARAM" == "" ]]; then
+      validateRequiredFile "$POLICY_ROOT_DIR"
+    fi
+
     if [[ "$POLICY_ERROR" = "false" ]]; then
       echo "  => all is good"
 
@@ -141,13 +158,6 @@ function main(){
         release "$POLICY_ROOT_DIR"
       fi
 
-      if [[ "$PARAM" == "--e2e-test" ]]; then
-        runUpdatecliDiff "$POLICY_ROOT_DIR"
-      fi
-
-      if [[ "$PARAM" == "--unit-test" ||  "$PARAM" == "" ]]; then
-        validateRequiredFile "$POLICY_ROOT_DIR"
-      fi
     else
       echo ""
       echo "  => validation test not passing"
@@ -161,3 +171,4 @@ function main(){
 }
 
 main "${1:-}"
+
diff --git a/updatecli/policies/autodiscovery/all/CHANGELOG.md b/updatecli/policies/autodiscovery/all/CHANGELOG.md
index 489c1f3..54b7a62 100644
--- a/updatecli/policies/autodiscovery/all/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/all/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog 
 
+## 0.7.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.6.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/all/Policy.yaml b/updatecli/policies/autodiscovery/all/Policy.yaml
index fcdeec9..ded8d73 100644
--- a/updatecli/policies/autodiscovery/all/Policy.yaml
+++ b/updatecli/policies/autodiscovery/all/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/all/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/all/"
-version: 0.6.0
+version: 0.7.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/all/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/all/updatecli.d/default.tpl
index feaab4b..3302373 100644
--- a/updatecli/policies/autodiscovery/all/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/all/updatecli.d/default.tpl
@@ -44,7 +44,9 @@ scms:
       # {{ $GitHubUser := env ""}}
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       # {{ $GitHubRepositoryList := env "GITHUB_REPOSITORY" | split "/"}}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
diff --git a/updatecli/policies/autodiscovery/cargo/CHANGELOG.md b/updatecli/policies/autodiscovery/cargo/CHANGELOG.md
index 346f70c..ca57f86 100644
--- a/updatecli/policies/autodiscovery/cargo/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/cargo/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/cargo/Policy.yaml b/updatecli/policies/autodiscovery/cargo/Policy.yaml
index a47ce58..bf46310 100644
--- a/updatecli/policies/autodiscovery/cargo/Policy.yaml
+++ b/updatecli/policies/autodiscovery/cargo/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/cargo/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/cargo/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/cargo/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/cargo/updatecli.d/default.tpl
index a76381b..6649887 100644
--- a/updatecli/policies/autodiscovery/cargo/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/cargo/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md b/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/dockercompose/Policy.yaml b/updatecli/policies/autodiscovery/dockercompose/Policy.yaml
index 06a3419..cac4ed2 100644
--- a/updatecli/policies/autodiscovery/dockercompose/Policy.yaml
+++ b/updatecli/policies/autodiscovery/dockercompose/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/dockercompose/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/dockercompose/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/dockercompose/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/dockercompose/updatecli.d/default.tpl
index fa51ff8..330208a 100644
--- a/updatecli/policies/autodiscovery/dockercompose/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/dockercompose/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md b/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/dockerfile/Policy.yaml b/updatecli/policies/autodiscovery/dockerfile/Policy.yaml
index 15ec985..aac775c 100644
--- a/updatecli/policies/autodiscovery/dockerfile/Policy.yaml
+++ b/updatecli/policies/autodiscovery/dockerfile/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/dockerfile/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/dockerfile/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/dockerfile/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/dockerfile/updatecli.d/default.tpl
index 8b1153a..5489488 100644
--- a/updatecli/policies/autodiscovery/dockerfile/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/dockerfile/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/flux/CHANGELOG.md b/updatecli/policies/autodiscovery/flux/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/flux/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/flux/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/flux/Policy.yaml b/updatecli/policies/autodiscovery/flux/Policy.yaml
index 143cf87..4293e78 100644
--- a/updatecli/policies/autodiscovery/flux/Policy.yaml
+++ b/updatecli/policies/autodiscovery/flux/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/flux/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/flux/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/flux/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/flux/updatecli.d/default.tpl
index 913b0e1..60e95c6 100644
--- a/updatecli/policies/autodiscovery/flux/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/flux/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/golang/CHANGELOG.md b/updatecli/policies/autodiscovery/golang/CHANGELOG.md
index 757a363..e6c0ee6 100644
--- a/updatecli/policies/autodiscovery/golang/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/golang/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.8.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/golang/Policy.yaml b/updatecli/policies/autodiscovery/golang/Policy.yaml
index 4184668..adc43a0 100644
--- a/updatecli/policies/autodiscovery/golang/Policy.yaml
+++ b/updatecli/policies/autodiscovery/golang/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/golang/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/golang/"
-version: 0.8.0
+version: 0.9.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/golang/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/golang/updatecli.d/default.tpl
index 1f186ae..8bb5474 100644
--- a/updatecli/policies/autodiscovery/golang/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/golang/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user}}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository}}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/helm/CHANGELOG.md b/updatecli/policies/autodiscovery/helm/CHANGELOG.md
index a0d7ed3..ebbed98 100644
--- a/updatecli/policies/autodiscovery/helm/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/helm/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/helm/Policy.yaml b/updatecli/policies/autodiscovery/helm/Policy.yaml
index 3997544..c43cc98 100644
--- a/updatecli/policies/autodiscovery/helm/Policy.yaml
+++ b/updatecli/policies/autodiscovery/helm/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/helm/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/helm/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/helm/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/helm/updatecli.d/default.tpl
index a61f57d..a42d367 100644
--- a/updatecli/policies/autodiscovery/helm/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/helm/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md b/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/helmfile/Policy.yaml b/updatecli/policies/autodiscovery/helmfile/Policy.yaml
index 6009905..1865e84 100644
--- a/updatecli/policies/autodiscovery/helmfile/Policy.yaml
+++ b/updatecli/policies/autodiscovery/helmfile/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/helmfile/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/helmfile/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/helmfile/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/helmfile/updatecli.d/default.tpl
index 4668428..39f164e 100644
--- a/updatecli/policies/autodiscovery/helmfile/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/helmfile/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/ko/CHANGELOG.md b/updatecli/policies/autodiscovery/ko/CHANGELOG.md
index 5b769ae..d6d5a1f 100644
--- a/updatecli/policies/autodiscovery/ko/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/ko/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/ko/Policy.yaml b/updatecli/policies/autodiscovery/ko/Policy.yaml
index 1aee29a..dfb9ef5 100644
--- a/updatecli/policies/autodiscovery/ko/Policy.yaml
+++ b/updatecli/policies/autodiscovery/ko/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/ko/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/ko/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/ko/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/ko/updatecli.d/default.tpl
index 3d708be..12513c7 100644
--- a/updatecli/policies/autodiscovery/ko/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/ko/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md b/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/kubernetes/Policy.yaml b/updatecli/policies/autodiscovery/kubernetes/Policy.yaml
index d8aa5c5..13c8c78 100644
--- a/updatecli/policies/autodiscovery/kubernetes/Policy.yaml
+++ b/updatecli/policies/autodiscovery/kubernetes/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/kubernetes/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/kubernetes/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/kubernetes/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/kubernetes/updatecli.d/default.tpl
index d804c38..fbcce10 100644
--- a/updatecli/policies/autodiscovery/kubernetes/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/kubernetes/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/maven/CHANGELOG.md b/updatecli/policies/autodiscovery/maven/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/maven/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/maven/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/maven/Policy.yaml b/updatecli/policies/autodiscovery/maven/Policy.yaml
index 2385459..fbcec41 100644
--- a/updatecli/policies/autodiscovery/maven/Policy.yaml
+++ b/updatecli/policies/autodiscovery/maven/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/maven/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/maven/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/maven/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/maven/updatecli.d/default.tpl
index d2b4e86..fa26475 100644
--- a/updatecli/policies/autodiscovery/maven/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/maven/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/npm/CHANGELOG.md b/updatecli/policies/autodiscovery/npm/CHANGELOG.md
index bbf9966..e360250 100644
--- a/updatecli/policies/autodiscovery/npm/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/npm/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.10.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.9.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/npm/Policy.yaml b/updatecli/policies/autodiscovery/npm/Policy.yaml
index a4280f9..7289658 100644
--- a/updatecli/policies/autodiscovery/npm/Policy.yaml
+++ b/updatecli/policies/autodiscovery/npm/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/npm/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/npm/"
-version: 0.9.0
+version: 0.10.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/npm/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/npm/updatecli.d/default.tpl
index 3f551a3..736efdd 100644
--- a/updatecli/policies/autodiscovery/npm/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/npm/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/prow/CHANGELOG.md b/updatecli/policies/autodiscovery/prow/CHANGELOG.md
index e384ce7..0c6595f 100644
--- a/updatecli/policies/autodiscovery/prow/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/prow/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.1.0
 
 * Init policy
diff --git a/updatecli/policies/autodiscovery/prow/Policy.yaml b/updatecli/policies/autodiscovery/prow/Policy.yaml
index 480939c..ddc74f1 100644
--- a/updatecli/policies/autodiscovery/prow/Policy.yaml
+++ b/updatecli/policies/autodiscovery/prow/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/prow/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/prow/"
-version: 0.1.0
+version: 0.2.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/prow/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/prow/updatecli.d/default.tpl
index 5fff739..7e3fe51 100644
--- a/updatecli/policies/autodiscovery/prow/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/prow/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md b/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/Policy.yaml b/updatecli/policies/autodiscovery/rancher/fleet/Policy.yaml
index bdc0743..940bef6 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/Policy.yaml
+++ b/updatecli/policies/autodiscovery/rancher/fleet/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/rancher/fleet/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/rancher/fleet/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/rancher/fleet/updatecli.d/default.tpl
index 9c3b30f..54494a5 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/rancher/fleet/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/terraform/CHANGELOG.md b/updatecli/policies/autodiscovery/terraform/CHANGELOG.md
index 6d14017..40ae9b5 100644
--- a/updatecli/policies/autodiscovery/terraform/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/terraform/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/autodiscovery/terraform/Policy.yaml b/updatecli/policies/autodiscovery/terraform/Policy.yaml
index 2231551..7b24e06 100644
--- a/updatecli/policies/autodiscovery/terraform/Policy.yaml
+++ b/updatecli/policies/autodiscovery/terraform/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/terraform/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/terraform/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/terraform/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/terraform/updatecli.d/default.tpl
index 686e98e..4fb86f2 100644
--- a/updatecli/policies/autodiscovery/terraform/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/terraform/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/terragrunt/CHANGELOG.md b/updatecli/policies/autodiscovery/terragrunt/CHANGELOG.md
index e384ce7..0c6595f 100644
--- a/updatecli/policies/autodiscovery/terragrunt/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/terragrunt/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.1.0
 
 * Init policy
diff --git a/updatecli/policies/autodiscovery/terragrunt/Policy.yaml b/updatecli/policies/autodiscovery/terragrunt/Policy.yaml
index e6e978d..bd45f6f 100644
--- a/updatecli/policies/autodiscovery/terragrunt/Policy.yaml
+++ b/updatecli/policies/autodiscovery/terragrunt/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/terragrunt/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/terragrunt/"
-version: 0.1.0
+version: 0.2.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/terragrunt/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/terragrunt/updatecli.d/default.tpl
index 084a376..203f467 100644
--- a/updatecli/policies/autodiscovery/terragrunt/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/terragrunt/updatecli.d/default.tpl
@@ -28,7 +28,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md b/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md
index b5ac3cf..fda226a 100644
--- a/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.6.0
 
 * Allow to opt out `scm.email`.
diff --git a/updatecli/policies/autodiscovery/updatecli/Policy.yaml b/updatecli/policies/autodiscovery/updatecli/Policy.yaml
index c737b03..7aa5884 100644
--- a/updatecli/policies/autodiscovery/updatecli/Policy.yaml
+++ b/updatecli/policies/autodiscovery/updatecli/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/updatecli/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/autodiscovery/updatecli/"
-version: 0.6.0
+version: 0.7.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/autodiscovery/updatecli/updatecli.d/default.tpl b/updatecli/policies/autodiscovery/updatecli/updatecli.d/default.tpl
index 11e11f0..24df89e 100644
--- a/updatecli/policies/autodiscovery/updatecli/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/updatecli/updatecli.d/default.tpl
@@ -28,7 +28,7 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
-#{{ if .scm.email }}
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
 # {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
diff --git a/updatecli/policies/golang/autodiscovery/CHANGELOG.md b/updatecli/policies/golang/autodiscovery/CHANGELOG.md
index 6aba805..913e7cc 100644
--- a/updatecli/policies/golang/autodiscovery/CHANGELOG.md
+++ b/updatecli/policies/golang/autodiscovery/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.7.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/golang/autodiscovery/Policy.yaml b/updatecli/policies/golang/autodiscovery/Policy.yaml
index cb3aa30..ef3bbf8 100644
--- a/updatecli/policies/golang/autodiscovery/Policy.yaml
+++ b/updatecli/policies/golang/autodiscovery/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/golang/autodiscovery/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/golang/autodiscovery/"
-version: 0.7.0
+version: 0.8.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/golang/autodiscovery/updatecli.d/default.tpl b/updatecli/policies/golang/autodiscovery/updatecli.d/default.tpl
index 638aaa9..e24db4c 100644
--- a/updatecli/policies/golang/autodiscovery/updatecli.d/default.tpl
+++ b/updatecli/policies/golang/autodiscovery/updatecli.d/default.tpl
@@ -26,7 +26,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user}}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository}}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/golang/version/CHANGELOG.md b/updatecli/policies/golang/version/CHANGELOG.md
index 15bb80a..b9732d1 100644
--- a/updatecli/policies/golang/version/CHANGELOG.md
+++ b/updatecli/policies/golang/version/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.2.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/golang/version/Policy.yaml b/updatecli/policies/golang/version/Policy.yaml
index be2b2ba..342cc37 100644
--- a/updatecli/policies/golang/version/Policy.yaml
+++ b/updatecli/policies/golang/version/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/golang/version/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/golang/version/"
-version: 0.2.0
+version: 0.3.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/golang/version/updatecli.d/default.tpl b/updatecli/policies/golang/version/updatecli.d/default.tpl
index 873cf83..83d2c49 100644
--- a/updatecli/policies/golang/version/updatecli.d/default.tpl
+++ b/updatecli/policies/golang/version/updatecli.d/default.tpl
@@ -43,7 +43,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user}}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository}}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/golangci-lint/githubaction/CHANGELOG.md b/updatecli/policies/golangci-lint/githubaction/CHANGELOG.md
index 6004932..51560f5 100644
--- a/updatecli/policies/golangci-lint/githubaction/CHANGELOG.md
+++ b/updatecli/policies/golangci-lint/githubaction/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.3.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.2.0
 
   * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/golangci-lint/githubaction/Policy.yaml b/updatecli/policies/golangci-lint/githubaction/Policy.yaml
index 234e1e8..71aa1e9 100644
--- a/updatecli/policies/golangci-lint/githubaction/Policy.yaml
+++ b/updatecli/policies/golangci-lint/githubaction/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/golangci-lint/githubaction/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/golangci-lint/githubaction/"
-version: 0.2.0
+version: 0.3.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/golangci-lint/githubaction/updatecli.d/default.yaml b/updatecli/policies/golangci-lint/githubaction/updatecli.d/default.yaml
index 01aad6b..306a61a 100644
--- a/updatecli/policies/golangci-lint/githubaction/updatecli.d/default.yaml
+++ b/updatecli/policies/golangci-lint/githubaction/updatecli.d/default.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/hugo/githubaction/CHANGELOG.md b/updatecli/policies/hugo/githubaction/CHANGELOG.md
index e9d34ec..64111b9 100644
--- a/updatecli/policies/hugo/githubaction/CHANGELOG.md
+++ b/updatecli/policies/hugo/githubaction/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.5.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/hugo/githubaction/Policy.yaml b/updatecli/policies/hugo/githubaction/Policy.yaml
index 5078fcb..7eacf2a 100644
--- a/updatecli/policies/hugo/githubaction/Policy.yaml
+++ b/updatecli/policies/hugo/githubaction/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/hugo/githubaction/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/hugo/githubaction/"
-version: 0.5.0
+version: 0.6.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/hugo/githubaction/updatecli.d/manifest.yaml b/updatecli/policies/hugo/githubaction/updatecli.d/manifest.yaml
index e3fb74c..6f01ed8 100644
--- a/updatecli/policies/hugo/githubaction/updatecli.d/manifest.yaml
+++ b/updatecli/policies/hugo/githubaction/updatecli.d/manifest.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default .scm.user $GitHubUser}}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/hugo/netlify/CHANGELOG.md b/updatecli/policies/hugo/netlify/CHANGELOG.md
index 382f3f1..2c8289b 100644
--- a/updatecli/policies/hugo/netlify/CHANGELOG.md
+++ b/updatecli/policies/hugo/netlify/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/hugo/netlify/Policy.yaml b/updatecli/policies/hugo/netlify/Policy.yaml
index 3795cce..5f060ef 100644
--- a/updatecli/policies/hugo/netlify/Policy.yaml
+++ b/updatecli/policies/hugo/netlify/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/hugo/netlify/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/hugo/netlify/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/hugo/netlify/updatecli.d/manifest.yaml b/updatecli/policies/hugo/netlify/updatecli.d/manifest.yaml
index 67540d2..3dbb673 100644
--- a/updatecli/policies/hugo/netlify/updatecli.d/manifest.yaml
+++ b/updatecli/policies/hugo/netlify/updatecli.d/manifest.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/nodejs/githubaction/CHANGELOG.md b/updatecli/policies/nodejs/githubaction/CHANGELOG.md
index d8dae4b..2776cc3 100644
--- a/updatecli/policies/nodejs/githubaction/CHANGELOG.md
+++ b/updatecli/policies/nodejs/githubaction/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.5.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/nodejs/githubaction/Policy.yaml b/updatecli/policies/nodejs/githubaction/Policy.yaml
index 4daea98..62fd926 100644
--- a/updatecli/policies/nodejs/githubaction/Policy.yaml
+++ b/updatecli/policies/nodejs/githubaction/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/nodejs/githubaction/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/nodejs/githubaction/"
-version: 0.5.0
+version: 0.6.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/nodejs/githubaction/updatecli.d/manifest.yaml b/updatecli/policies/nodejs/githubaction/updatecli.d/manifest.yaml
index a07bf0f..87ade04 100644
--- a/updatecli/policies/nodejs/githubaction/updatecli.d/manifest.yaml
+++ b/updatecli/policies/nodejs/githubaction/updatecli.d/manifest.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/nodejs/netlify/CHANGELOG.md b/updatecli/policies/nodejs/netlify/CHANGELOG.md
index fd0fbef..72b83f2 100644
--- a/updatecli/policies/nodejs/netlify/CHANGELOG.md
+++ b/updatecli/policies/nodejs/netlify/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.4.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/nodejs/netlify/Policy.yaml b/updatecli/policies/nodejs/netlify/Policy.yaml
index 616e352..34e8802 100644
--- a/updatecli/policies/nodejs/netlify/Policy.yaml
+++ b/updatecli/policies/nodejs/netlify/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/nodejs/netlify/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/nodejs/netlify/"
-version: 0.4.0
+version: 0.5.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/nodejs/netlify/updatecli.d/manifest.yaml b/updatecli/policies/nodejs/netlify/updatecli.d/manifest.yaml
index ea6241b..e27181f 100644
--- a/updatecli/policies/nodejs/netlify/updatecli.d/manifest.yaml
+++ b/updatecli/policies/nodejs/netlify/updatecli.d/manifest.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/npm/autodiscovery/CHANGELOG.md b/updatecli/policies/npm/autodiscovery/CHANGELOG.md
index 728816c..4df2513 100644
--- a/updatecli/policies/npm/autodiscovery/CHANGELOG.md
+++ b/updatecli/policies/npm/autodiscovery/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.8.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.7.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/npm/autodiscovery/Policy.yaml b/updatecli/policies/npm/autodiscovery/Policy.yaml
index ab38e01..7a5e070 100644
--- a/updatecli/policies/npm/autodiscovery/Policy.yaml
+++ b/updatecli/policies/npm/autodiscovery/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/npm/autodiscovery/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/npm/autodiscovery/"
-version: 0.7.0
+version: 0.8.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/npm/autodiscovery/updatecli.d/default.tpl b/updatecli/policies/npm/autodiscovery/updatecli.d/default.tpl
index 04638ac..db33204 100644
--- a/updatecli/policies/npm/autodiscovery/updatecli.d/default.tpl
+++ b/updatecli/policies/npm/autodiscovery/updatecli.d/default.tpl
@@ -26,7 +26,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/npm/netlify/CHANGELOG.md b/updatecli/policies/npm/netlify/CHANGELOG.md
index 352b326..0e54357 100644
--- a/updatecli/policies/npm/netlify/CHANGELOG.md
+++ b/updatecli/policies/npm/netlify/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.5.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/npm/netlify/Policy.yaml b/updatecli/policies/npm/netlify/Policy.yaml
index 1bc7377..52c61b3 100644
--- a/updatecli/policies/npm/netlify/Policy.yaml
+++ b/updatecli/policies/npm/netlify/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/npm/netlify/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/npm/netlify/"
-version: 0.5.0
+version: 0.6.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/npm/netlify/updatecli.d/manifest.yaml b/updatecli/policies/npm/netlify/updatecli.d/manifest.yaml
index da45a9b..28170bb 100644
--- a/updatecli/policies/npm/netlify/updatecli.d/manifest.yaml
+++ b/updatecli/policies/npm/netlify/updatecli.d/manifest.yaml
@@ -27,7 +27,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/pulumi/CHANGELOG.md b/updatecli/policies/pulumi/CHANGELOG.md
index 6004932..51560f5 100644
--- a/updatecli/policies/pulumi/CHANGELOG.md
+++ b/updatecli/policies/pulumi/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.3.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.2.0
 
   * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/pulumi/Policy.yaml b/updatecli/policies/pulumi/Policy.yaml
index e34b13a..65f5633 100644
--- a/updatecli/policies/pulumi/Policy.yaml
+++ b/updatecli/policies/pulumi/Policy.yaml
@@ -6,16 +6,16 @@ authors:
   - olivier Vernin <olivier@vernin.me>
 
 ## URL is the policy url
-url: ghcr.io/updatecli/policies/updatecli/pulumi
+url: "https://github.com/updatecli/policies/"
 
 ## Documentation is the policy documentation URL
-documentation: https://github.com/updatecli/policies/blob/main/updatecli/policies/pulumi/README.md
+documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/pulumi/README.md"
 
 ## Source is the policy source URL
-source: https://github.com/updatecli/policies/blob/main/updatecli/policies/pulumi/
+source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/pulumi/"
 
 # Version is the policy version. 
-version: 0.2.0
+version: 0.3.0
 
 ## Vendor is the policy vendor
 vendor: Updatecli Project
diff --git a/updatecli/policies/rancher/fleet/autodiscovery/CHANGELOG.md b/updatecli/policies/rancher/fleet/autodiscovery/CHANGELOG.md
index 15bb80a..b9732d1 100644
--- a/updatecli/policies/rancher/fleet/autodiscovery/CHANGELOG.md
+++ b/updatecli/policies/rancher/fleet/autodiscovery/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.2.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/rancher/fleet/autodiscovery/Policy.yaml b/updatecli/policies/rancher/fleet/autodiscovery/Policy.yaml
index a7ec9e3..cb1c0b9 100644
--- a/updatecli/policies/rancher/fleet/autodiscovery/Policy.yaml
+++ b/updatecli/policies/rancher/fleet/autodiscovery/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/rancher/fleet/autodiscovery/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/rancher/fleet/autodiscovery/"
-version: 0.2.0
+version: 0.3.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/rancher/fleet/autodiscovery/updatecli.d/default.tpl b/updatecli/policies/rancher/fleet/autodiscovery/updatecli.d/default.tpl
index ec21b9c..5ae7f20 100644
--- a/updatecli/policies/rancher/fleet/autodiscovery/updatecli.d/default.tpl
+++ b/updatecli/policies/rancher/fleet/autodiscovery/updatecli.d/default.tpl
@@ -25,7 +25,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user}}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository}}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/releasepost/releasepost/CHANGELOG.md b/updatecli/policies/releasepost/releasepost/CHANGELOG.md
index 15bb80a..dab48f5 100644
--- a/updatecli/policies/releasepost/releasepost/CHANGELOG.md
+++ b/updatecli/policies/releasepost/releasepost/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* Allow to opt out `scm.email`
+
 ## 0.2.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/releasepost/releasepost/Policy.yaml b/updatecli/policies/releasepost/releasepost/Policy.yaml
index fd22978..5700233 100644
--- a/updatecli/policies/releasepost/releasepost/Policy.yaml
+++ b/updatecli/policies/releasepost/releasepost/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/releasepost/releasepost/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/releasepost/releasepost/"
-version: 0.2.0
+version: 0.3.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/releasepost/releasepost/updatecli.d/default.tpl b/updatecli/policies/releasepost/releasepost/updatecli.d/default.tpl
index ac49692..3b0ba6f 100644
--- a/updatecli/policies/releasepost/releasepost/updatecli.d/default.tpl
+++ b/updatecli/policies/releasepost/releasepost/updatecli.d/default.tpl
@@ -35,7 +35,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/updatecli/autodiscovery/CHANGELOG.md b/updatecli/policies/updatecli/autodiscovery/CHANGELOG.md
index 4a06a66..c5e120a 100644
--- a/updatecli/policies/updatecli/autodiscovery/CHANGELOG.md
+++ b/updatecli/policies/updatecli/autodiscovery/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.3.0
 
 * Allow to set commit with GitHub GraphQL API using `scm.commitusingapi`
diff --git a/updatecli/policies/updatecli/autodiscovery/Policy.yaml b/updatecli/policies/updatecli/autodiscovery/Policy.yaml
index eea005d..824c67a 100644
--- a/updatecli/policies/updatecli/autodiscovery/Policy.yaml
+++ b/updatecli/policies/updatecli/autodiscovery/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/updatecli/autodiscovery/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/updatecli/autodiscovery/"
-version: 0.3.0
+version: 0.4.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/updatecli/autodiscovery/updatecli.d/default.tpl b/updatecli/policies/updatecli/autodiscovery/updatecli.d/default.tpl
index d76727e..92fb15a 100644
--- a/updatecli/policies/updatecli/autodiscovery/updatecli.d/default.tpl
+++ b/updatecli/policies/updatecli/autodiscovery/updatecli.d/default.tpl
@@ -26,7 +26,9 @@ scms:
     spec:
       # Priority set to the environment variable
       user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
       email: '{{ .scm.email }}'
+# {{ end }}
       owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
       repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
       token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/updatecli/githubaction/CHANGELOG.md b/updatecli/policies/updatecli/githubaction/CHANGELOG.md
index 14b033f..483ac11 100644
--- a/updatecli/policies/updatecli/githubaction/CHANGELOG.md
+++ b/updatecli/policies/updatecli/githubaction/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0
+
+* Allow to opt out `scm.email`.
+
 ## 0.1.0
 
 * Introduce a new version of the policy
diff --git a/updatecli/policies/updatecli/githubaction/Policy.yaml b/updatecli/policies/updatecli/githubaction/Policy.yaml
index 149a83a..33f229e 100644
--- a/updatecli/policies/updatecli/githubaction/Policy.yaml
+++ b/updatecli/policies/updatecli/githubaction/Policy.yaml
@@ -4,7 +4,7 @@ authors:
 url: "https://github.com/updatecli/policies/"
 documentation: "https://github.com/updatecli/policies/tree/main/updatecli/policies/updatecli/githubaction/README.md"
 source: "https://github.com/updatecli/policies/tree/main/updatecli/policies/updatecli/githubaction/"
-version: 0.1.0
+version: 0.2.0
 vendor: Updatecli Project
 
 licenses:
diff --git a/updatecli/policies/updatecli/githubaction/updatecli.d/action-version.yaml b/updatecli/policies/updatecli/githubaction/updatecli.d/action-version.yaml
index b38341f..4735c0c 100644
--- a/updatecli/policies/updatecli/githubaction/updatecli.d/action-version.yaml
+++ b/updatecli/policies/updatecli/githubaction/updatecli.d/action-version.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'
diff --git a/updatecli/policies/updatecli/githubaction/updatecli.d/action.yaml b/updatecli/policies/updatecli/githubaction/updatecli.d/action.yaml
index 01df5af..5d2723d 100644
--- a/updatecli/policies/updatecli/githubaction/updatecli.d/action.yaml
+++ b/updatecli/policies/updatecli/githubaction/updatecli.d/action.yaml
@@ -28,7 +28,9 @@ scms:
         spec:
             # Priority set to the environment variable
             user: '{{ default $GitHubUser .scm.user }}'
+# {{ if .scm.email }}
             email: '{{ .scm.email }}'
+# {{ end }}
             owner: '{{ default $GitHubRepositoryList._0 .scm.owner }}'
             repository: '{{ default $GitHubRepositoryList._1 .scm.repository }}'
             token: '{{ default $GitHubPAT .scm.token }}'