diff --git a/updatecli/policies/autodiscovery/all/CHANGELOG.md b/updatecli/policies/autodiscovery/all/CHANGELOG.md
index 860d868..d980c17 100644
--- a/updatecli/policies/autodiscovery/all/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/all/CHANGELOG.md
@@ -1,15 +1,19 @@
 # Changelog 
 
-# 0.4.0
+## 0.5.0
+
+* By default undefined pipelineid
+
+## 0.4.0
 
 * Allow to override pipeline name
 
-# 0.3.0
+## 0.3.0
 
 * Swap default order for scm configuration to use environment variable if nothing else is defined
 
-# 0.2.0
+## 0.2.0
 
-# 0.1.0
+## 0.1.0
 
 * Init policy
diff --git a/updatecli/policies/autodiscovery/all/Policy.yaml b/updatecli/policies/autodiscovery/all/Policy.yaml
index 979189a..3b6c65e 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.4.0
+version: 0.5.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 4b84ea3..14922da 100644
--- a/updatecli/policies/autodiscovery/all/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/all/updatecli.d/default.tpl
@@ -1,6 +1,10 @@
 ---
 name: '{{ .name }}'
 
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
+
 autodiscovery:
   groupby: {{ .autodiscovery.groupby }}
 {{ if or (.scm.enabled) (env "GITHUB_REPOSITORY") }}
diff --git a/updatecli/policies/autodiscovery/all/values.yaml b/updatecli/policies/autodiscovery/all/values.yaml
index 57a6b95..3186674 100644
--- a/updatecli/policies/autodiscovery/all/values.yaml
+++ b/updatecli/policies/autodiscovery/all/values.yaml
@@ -1,5 +1,7 @@
 name: 'deps: Bump all dependencies'
 
+#pipelineid: all
+
 autodiscovery:
   groupby: all
 
diff --git a/updatecli/policies/autodiscovery/cargo/CHANGELOG.md b/updatecli/policies/autodiscovery/cargo/CHANGELOG.md
index 2ba3c32..e587d96 100644
--- a/updatecli/policies/autodiscovery/cargo/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/cargo/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/cargo/Policy.yaml b/updatecli/policies/autodiscovery/cargo/Policy.yaml
index 5ab6c92..7b55ae0 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.2.0
+version: 0.3.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 a28bbc3..6fcfc6e 100644
--- a/updatecli/policies/autodiscovery/cargo/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/cargo/updatecli.d/default.tpl
@@ -6,14 +6,16 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
 #{{ if or (.scm.enabled) (env "GITHUB_REPOSITORY") }}
   scmid: default
   actionid: default
-# {{ end }}
+#{{ end }}
 
   crawlers:
     cargo:
diff --git a/updatecli/policies/autodiscovery/cargo/values.yaml b/updatecli/policies/autodiscovery/cargo/values.yaml
index faa0fce..e1ac5fa 100644
--- a/updatecli/policies/autodiscovery/cargo/values.yaml
+++ b/updatecli/policies/autodiscovery/cargo/values.yaml
@@ -1,6 +1,6 @@
 name: "deps(cargo): bump all policies"
 
-pipelineid: cargo/autodiscovery
+# pipelineid: cargo/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md b/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/dockercompose/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/dockercompose/Policy.yaml b/updatecli/policies/autodiscovery/dockercompose/Policy.yaml
index 3521de9..5d6537d 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.2.0
+version: 0.3.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 55eef89..696d066 100644
--- a/updatecli/policies/autodiscovery/dockercompose/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/dockercompose/updatecli.d/default.tpl
@@ -6,14 +6,16 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
 #{{ if or (.scm.enabled) (env "GITHUB_REPOSITORY") }}
   scmid: default
   actionid: default
-# {{ end }}
+#{{ end }}
 
   crawlers:
     dockercompose:
diff --git a/updatecli/policies/autodiscovery/dockercompose/values.yaml b/updatecli/policies/autodiscovery/dockercompose/values.yaml
index 7a94f85..4d5076e 100644
--- a/updatecli/policies/autodiscovery/dockercompose/values.yaml
+++ b/updatecli/policies/autodiscovery/dockercompose/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(dockercompose): bump dependencies"
-pipelineid: dockercompose/autodiscovery
+# pipelineid: dockercompose/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md b/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/dockerfile/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/dockerfile/Policy.yaml b/updatecli/policies/autodiscovery/dockerfile/Policy.yaml
index 7864040..604bcca 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.2.0
+version: 0.3.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 1c3d055..f3aa7c5 100644
--- a/updatecli/policies/autodiscovery/dockerfile/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/dockerfile/updatecli.d/default.tpl
@@ -6,14 +6,16 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
 #{{ if or (.scm.enabled) (env "GITHUB_REPOSITORY") }}
   scmid: default
   actionid: default
-# {{ end }}
+#{{ end }}
 
   crawlers:
     dockerfile:
diff --git a/updatecli/policies/autodiscovery/dockerfile/values.yaml b/updatecli/policies/autodiscovery/dockerfile/values.yaml
index 6a46a9b..11008dd 100644
--- a/updatecli/policies/autodiscovery/dockerfile/values.yaml
+++ b/updatecli/policies/autodiscovery/dockerfile/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(dockerfile): bump all dependencies"
-pipelineid: dockerfile/autodiscovery
+#pipelineid: dockerfile/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/flux/CHANGELOG.md b/updatecli/policies/autodiscovery/flux/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/flux/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/flux/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/flux/Policy.yaml b/updatecli/policies/autodiscovery/flux/Policy.yaml
index e2572df..2ab2320 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.2.0
+version: 0.3.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 50d4388..5357e39 100644
--- a/updatecli/policies/autodiscovery/flux/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/flux/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/flux/values.yaml b/updatecli/policies/autodiscovery/flux/values.yaml
index 0e574b9..77c9ed9 100644
--- a/updatecli/policies/autodiscovery/flux/values.yaml
+++ b/updatecli/policies/autodiscovery/flux/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(flux): bump all dependencies"
-pipelineid: flux/autodiscovery
+#pipelineid: flux/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/golang/CHANGELOG.md b/updatecli/policies/autodiscovery/golang/CHANGELOG.md
index a053903..32b112e 100644
--- a/updatecli/policies/autodiscovery/golang/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/golang/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.0
+
+* By default, undefined pipelineid
+
 ## 0.6.0
 
 * Allow to set pipeline name using `name`
diff --git a/updatecli/policies/autodiscovery/golang/Policy.yaml b/updatecli/policies/autodiscovery/golang/Policy.yaml
index 2d88463..b0069eb 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.6.0
+version: 0.7.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 1ca4c0e..4cc782f 100644
--- a/updatecli/policies/autodiscovery/golang/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/golang/updatecli.d/default.tpl
@@ -6,14 +6,16 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
+#{{ if .pipelineid }}
 pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
 #{{ if or (.scm.enabled) (env "GITHUB_REPOSITORY") }}
   scmid: default
   actionid: default
-# {{ end }}
+#{{ end }}
 
   crawlers:
     golang/gomod:
diff --git a/updatecli/policies/autodiscovery/golang/values.yaml b/updatecli/policies/autodiscovery/golang/values.yaml
index 61cf42c..79395ca 100644
--- a/updatecli/policies/autodiscovery/golang/values.yaml
+++ b/updatecli/policies/autodiscovery/golang/values.yaml
@@ -1,5 +1,5 @@
 name: 'deps(golang): Bump all dependencies'
-pipelineid: golang/autodiscovery
+#pipelineid: golang/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/helm/CHANGELOG.md b/updatecli/policies/autodiscovery/helm/CHANGELOG.md
index 2ba3c32..b97fcc5 100644
--- a/updatecli/policies/autodiscovery/helm/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/helm/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/helm/Policy.yaml b/updatecli/policies/autodiscovery/helm/Policy.yaml
index f2c5de6..27ade34 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.2.0
+version: 0.3.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 2e0bd66..cd8462c 100644
--- a/updatecli/policies/autodiscovery/helm/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/helm/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/helm/values.yaml b/updatecli/policies/autodiscovery/helm/values.yaml
index 20ca683..99db12f 100644
--- a/updatecli/policies/autodiscovery/helm/values.yaml
+++ b/updatecli/policies/autodiscovery/helm/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(helm): bump all dependencies"
-pipelineid: helm/autodiscovery
+#pipelineid: helm/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md b/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/helmfile/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/helmfile/Policy.yaml b/updatecli/policies/autodiscovery/helmfile/Policy.yaml
index 0d3208a..e385594 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.2.0
+version: 0.3.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 fd3c63f..88b26fb 100644
--- a/updatecli/policies/autodiscovery/helmfile/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/helmfile/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/helmfile/values.yaml b/updatecli/policies/autodiscovery/helmfile/values.yaml
index 6052096..87e33e4 100644
--- a/updatecli/policies/autodiscovery/helmfile/values.yaml
+++ b/updatecli/policies/autodiscovery/helmfile/values.yaml
@@ -1,5 +1,5 @@
 name : "deps(helmfile): bump all dependencies"
-pipelineid: helmfile/autodiscovery
+#pipelineid: helmfile/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/ko/CHANGELOG.md b/updatecli/policies/autodiscovery/ko/CHANGELOG.md
index 2ba3c32..034eea6 100644
--- a/updatecli/policies/autodiscovery/ko/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/ko/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+ 
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/ko/Policy.yaml b/updatecli/policies/autodiscovery/ko/Policy.yaml
index 0a10fbf..1a826ad 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.2.0
+version: 0.3.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 6fbf6a0..e635f89 100644
--- a/updatecli/policies/autodiscovery/ko/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/ko/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/ko/values.yaml b/updatecli/policies/autodiscovery/ko/values.yaml
index 982303b..39c9d52 100644
--- a/updatecli/policies/autodiscovery/ko/values.yaml
+++ b/updatecli/policies/autodiscovery/ko/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(ko): bump all dependencies"
-pipelineid: ko/autodiscovery
+#pipelineid: ko/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md b/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/kubernetes/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/kubernetes/Policy.yaml b/updatecli/policies/autodiscovery/kubernetes/Policy.yaml
index 51ab8a8..ff06cd4 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.2.0
+version: 0.3.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 5defd31..dfcb05b 100644
--- a/updatecli/policies/autodiscovery/kubernetes/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/kubernetes/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/kubernetes/values.yaml b/updatecli/policies/autodiscovery/kubernetes/values.yaml
index dc07fbb..1a03864 100644
--- a/updatecli/policies/autodiscovery/kubernetes/values.yaml
+++ b/updatecli/policies/autodiscovery/kubernetes/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(kubernetes): bump all dependencies"
-pipelineid: kubernetes/autodiscovery
+#pipelineid: kubernetes/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/maven/CHANGELOG.md b/updatecli/policies/autodiscovery/maven/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/maven/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/maven/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/maven/Policy.yaml b/updatecli/policies/autodiscovery/maven/Policy.yaml
index 30b08fc..d00e1f0 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.2.0
+version: 0.3.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 8e9c8f6..3e2585a 100644
--- a/updatecli/policies/autodiscovery/maven/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/maven/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/maven/values.yaml b/updatecli/policies/autodiscovery/maven/values.yaml
index 21be501..f117a8b 100644
--- a/updatecli/policies/autodiscovery/maven/values.yaml
+++ b/updatecli/policies/autodiscovery/maven/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(maven): bump all dependencies"
-pipelineid: maven/autodiscovery
+#pipelineid: maven/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/npm/CHANGELOG.md b/updatecli/policies/autodiscovery/npm/CHANGELOG.md
index 8c3f9c1..e14fcd1 100644
--- a/updatecli/policies/autodiscovery/npm/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/npm/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.8.0
+
+* By default, undefined pipelineid
+
 ## 0.7.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/npm/Policy.yaml b/updatecli/policies/autodiscovery/npm/Policy.yaml
index e36dacf..8ec6193 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.7.0
+version: 0.8.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 35797a1..7c229e2 100644
--- a/updatecli/policies/autodiscovery/npm/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/npm/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/npm/values.yaml b/updatecli/policies/autodiscovery/npm/values.yaml
index e89e754..8d878a9 100644
--- a/updatecli/policies/autodiscovery/npm/values.yaml
+++ b/updatecli/policies/autodiscovery/npm/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(npm): bump all dependencies"
-pipelineid: npm/autodiscovery
+#pipelineid: npm/autodiscovery
 automerge: false
 
 autodiscovery:
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md b/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/rancher/fleet/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/Policy.yaml b/updatecli/policies/autodiscovery/rancher/fleet/Policy.yaml
index b9389c6..14a37e4 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.2.0
+version: 0.3.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 d919948..4b6e096 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/rancher/fleet/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/values.yaml b/updatecli/policies/autodiscovery/rancher/fleet/values.yaml
index bb343a6..9284598 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/values.yaml
+++ b/updatecli/policies/autodiscovery/rancher/fleet/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(rancher/fleet): bump dependencies"
-pipelineid: rancher/fleet/autodiscovery
+#pipelineid: rancher/fleet/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/terraform/CHANGELOG.md b/updatecli/policies/autodiscovery/terraform/CHANGELOG.md
index 2ba3c32..dbb9774 100644
--- a/updatecli/policies/autodiscovery/terraform/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/terraform/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+
+* By default, undefined pipelineid
+
 ## 0.2.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/terraform/Policy.yaml b/updatecli/policies/autodiscovery/terraform/Policy.yaml
index aefc81d..8da9aa0 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.2.0
+version: 0.3.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 22d54f8..9ea2264 100644
--- a/updatecli/policies/autodiscovery/terraform/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/terraform/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/terraform/values.yaml b/updatecli/policies/autodiscovery/terraform/values.yaml
index c14ce6f..f70bb94 100644
--- a/updatecli/policies/autodiscovery/terraform/values.yaml
+++ b/updatecli/policies/autodiscovery/terraform/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(terraform): bump all dependencies"
-pipelineid: terraform/autodiscovery
+#pipelineid: terraform/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md b/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md
index 3e40a83..3734231 100644
--- a/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md
+++ b/updatecli/policies/autodiscovery/updatecli/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.0
+
+* By default, undefined pipelineid
+
 ## 0.3.0
 
 * Allow to override pipeline name
diff --git a/updatecli/policies/autodiscovery/updatecli/Policy.yaml b/updatecli/policies/autodiscovery/updatecli/Policy.yaml
index 71e3af0..4efbca1 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.3.0
+version: 0.4.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 26c3a02..b493133 100644
--- a/updatecli/policies/autodiscovery/updatecli/updatecli.d/default.tpl
+++ b/updatecli/policies/autodiscovery/updatecli/updatecli.d/default.tpl
@@ -6,7 +6,9 @@
 # {{ $GitHubUsername := env "GITHUB_ACTOR"}}
 
 name: '{{ .name }}'
-pipelineid: {{ .pipelineid }}
+#{{ if .pipelineid }}
+pipelineid: '{{ .pipelineid }}'
+#{{ end }}
 
 autodiscovery:
   groupby: {{ .groupby }}
diff --git a/updatecli/policies/autodiscovery/updatecli/values.yaml b/updatecli/policies/autodiscovery/updatecli/values.yaml
index 3120add..4396bf3 100644
--- a/updatecli/policies/autodiscovery/updatecli/values.yaml
+++ b/updatecli/policies/autodiscovery/updatecli/values.yaml
@@ -1,5 +1,5 @@
 name: "deps(updatecli): bump all policies"
-pipelineid: updatecli/autodiscovery
+#pipelineid: updatecli/autodiscovery
 automerge: false
 
 scm: