diff --git a/updatecli/policies/autodiscovery/cargo/values.yaml b/updatecli/policies/autodiscovery/cargo/values.yaml
index 049487d..6b80d1b 100644
--- a/updatecli/policies/autodiscovery/cargo/values.yaml
+++ b/updatecli/policies/autodiscovery/cargo/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: cargo_policies
+pipelineid: cargo/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/dockercompose/values.yaml b/updatecli/policies/autodiscovery/dockercompose/values.yaml
index d51bb39..7be13b8 100644
--- a/updatecli/policies/autodiscovery/dockercompose/values.yaml
+++ b/updatecli/policies/autodiscovery/dockercompose/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: dockercompose_policies
+pipelineid: dockercompose/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/dockerfile/values.yaml b/updatecli/policies/autodiscovery/dockerfile/values.yaml
index 53685d2..6ec36fe 100644
--- a/updatecli/policies/autodiscovery/dockerfile/values.yaml
+++ b/updatecli/policies/autodiscovery/dockerfile/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: dockerfile_policies
+pipelineid: dockerfile/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/flux/values.yaml b/updatecli/policies/autodiscovery/flux/values.yaml
index e98f76a..44f95c8 100644
--- a/updatecli/policies/autodiscovery/flux/values.yaml
+++ b/updatecli/policies/autodiscovery/flux/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: flux_policies
+pipelineid: flux/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/golang/values.yaml b/updatecli/policies/autodiscovery/golang/values.yaml
index c62fabb..61cf42c 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/all
+pipelineid: golang/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/helm/values.yaml b/updatecli/policies/autodiscovery/helm/values.yaml
index 8b3ba6b..60227a1 100644
--- a/updatecli/policies/autodiscovery/helm/values.yaml
+++ b/updatecli/policies/autodiscovery/helm/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: helm_policies
+pipelineid: helm/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/helmfile/values.yaml b/updatecli/policies/autodiscovery/helmfile/values.yaml
index c90f231..97979bf 100644
--- a/updatecli/policies/autodiscovery/helmfile/values.yaml
+++ b/updatecli/policies/autodiscovery/helmfile/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: helmfile_policies
+pipelineid: helmfile/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/ko/values.yaml b/updatecli/policies/autodiscovery/ko/values.yaml
index 70436ce..9eb72bb 100644
--- a/updatecli/policies/autodiscovery/ko/values.yaml
+++ b/updatecli/policies/autodiscovery/ko/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: ko_policies
+pipelineid: ko/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/kubernetes/values.yaml b/updatecli/policies/autodiscovery/kubernetes/values.yaml
index 4f969e6..68ac7db 100644
--- a/updatecli/policies/autodiscovery/kubernetes/values.yaml
+++ b/updatecli/policies/autodiscovery/kubernetes/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: kubernetes_policies
+pipelineid: kubernetes/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/maven/values.yaml b/updatecli/policies/autodiscovery/maven/values.yaml
index eb88152..707fa7d 100644
--- a/updatecli/policies/autodiscovery/maven/values.yaml
+++ b/updatecli/policies/autodiscovery/maven/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: maven_policies
+pipelineid: maven/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/npm/values.yaml b/updatecli/policies/autodiscovery/npm/values.yaml
index d424ed9..abfaa4e 100644
--- a/updatecli/policies/autodiscovery/npm/values.yaml
+++ b/updatecli/policies/autodiscovery/npm/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: npm_autodiscovery
+pipelineid: npm/autodiscovery
 automerge: false
 
 autodiscovery:
diff --git a/updatecli/policies/autodiscovery/rancher/fleet/values.yaml b/updatecli/policies/autodiscovery/rancher/fleet/values.yaml
index 2cb9547..1b69d56 100644
--- a/updatecli/policies/autodiscovery/rancher/fleet/values.yaml
+++ b/updatecli/policies/autodiscovery/rancher/fleet/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: rancher_fleet_policies
+pipelineid: rancher/fleet/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/terraform/values.yaml b/updatecli/policies/autodiscovery/terraform/values.yaml
index bcac644..67edbb3 100644
--- a/updatecli/policies/autodiscovery/terraform/values.yaml
+++ b/updatecli/policies/autodiscovery/terraform/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: terraform_policies
+pipelineid: terraform/autodiscovery
 automerge: false
 
 scm:
diff --git a/updatecli/policies/autodiscovery/updatecli/.values.yaml.swp b/updatecli/policies/autodiscovery/updatecli/.values.yaml.swp
new file mode 100644
index 0000000..82995a2
Binary files /dev/null and b/updatecli/policies/autodiscovery/updatecli/.values.yaml.swp differ
diff --git a/updatecli/policies/autodiscovery/updatecli/values.yaml b/updatecli/policies/autodiscovery/updatecli/values.yaml
index 619bfe5..a6c089e 100644
--- a/updatecli/policies/autodiscovery/updatecli/values.yaml
+++ b/updatecli/policies/autodiscovery/updatecli/values.yaml
@@ -1,4 +1,4 @@
-pipelineid: updatecli_policies
+pipelineid: updatecli/autodiscovery
 automerge: false
 
 scm: