diff --git a/.github/updatecli/updatecli.d/versions.yml b/.github/updatecli/updatecli.d/versions.yml
index 3c8a78b40..84c0282f9 100644
--- a/.github/updatecli/updatecli.d/versions.yml
+++ b/.github/updatecli/updatecli.d/versions.yml
@@ -8,7 +8,7 @@ scms:
       user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: '{{ .scm.owner }}'
-      repository: '{{ .scm.repository }}'
+      repository: docs-builder
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
       branch: '{{ .scm.branch }}'
@@ -47,6 +47,45 @@ sources:
       versionfilter:
         kind: latest
 
+  latest-edot-cf-aws-version:
+    name: Get latest release version for the edot-cf-aws
+    kind: githubrelease
+    transformers:
+      - trimprefix: v
+    spec:
+      owner: elastic
+      repository: edot-cloud-forwarder-aws
+      token: '{{ requiredEnv "GITHUB_TOKEN" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
+      versionfilter:
+        kind: latest
+
+  latest-edot-cf-azure-version:
+    name: Get latest release version for the edot-cf-azure
+    kind: githubrelease
+    transformers:
+      - trimprefix: v
+    spec:
+      owner: elastic
+      repository: edot-cloud-forwarder-azure
+      token: '{{ requiredEnv "GITHUB_TOKEN" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
+      versionfilter:
+        kind: latest
+
+  # latest-edot-cf-gcp-version:
+  #   name: Get latest release version for the edot-cf-gcp
+  #   kind: githubrelease
+  #   transformers:
+  #     - trimprefix: v
+  #   spec:
+  #     owner: elastic
+  #     repository: edot-cloud-forwarder-gcp
+  #     token: '{{ requiredEnv "GITHUB_TOKEN" }}'
+  #     username: '{{ requiredEnv "GITHUB_ACTOR" }}'
+  #     versionfilter:
+  #       kind: latest
+
   latest-edot-collector-version:
     name: Get latest major release version for the elastic-agent
     kind: githubrelease
@@ -305,6 +344,33 @@ targets:
       file: config/versions.yml
       key: versioning_systems.edot-android.current
 
+  update-docs-docset-cf-aws:
+    name: 'Update config/versions.yml edot-cf-aws {{ source "latest-edot-cf-aws-version" }}'
+    scmid: githubConfig
+    sourceid: latest-edot-cf-aws-version
+    kind: yaml
+    spec:
+      file: config/versions.yml
+      key: versioning_systems.edot-cf-aws.current
+
+  update-docs-docset-cf-azure:
+    name: 'Update config/versions.yml edot-cf-azure {{ source "latest-edot-cf-azure-version" }}'
+    scmid: githubConfig
+    sourceid: latest-edot-cf-azure-version
+    kind: yaml
+    spec:
+      file: config/versions.yml
+      key: versioning_systems.edot-cf-azure.current
+
+  # update-docs-docset-cf-gcp:
+  #   name: 'Update config/versions.yml edot-cf-gcp {{ source "latest-edot-cf-gcp-version" }}'
+  #   scmid: githubConfig
+  #   sourceid: latest-edot-cf-gcp-version
+  #   kind: yaml
+  #   spec:
+  #     file: config/versions.yml
+  #     key: versioning_systems.edot-cf-gcp.current
+
   update-docs-docset-collector:
     name: 'Update config/versions.yml edot-collector {{ source "latest-edot-collector-version" }}'
     scmid: githubConfig
diff --git a/.github/updatecli/values.d/scm.yml b/.github/updatecli/values.d/scm.yml
index f2693d960..14e42cd46 100644
--- a/.github/updatecli/values.d/scm.yml
+++ b/.github/updatecli/values.d/scm.yml
@@ -1,5 +1,9 @@
 scm:
   enabled: true
   owner: elastic
-  repository: docs-builder
+  repositories: |
+    docs-builder
+    edot-cloud-forwarder-aws
+    edot-cloud-forwarder-azure
+    edot-cloud-forwarder-gcp
   branch: main
\ No newline at end of file
diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml
index 505118b7b..b833930da 100644
--- a/.github/workflows/updatecli.yml
+++ b/.github/workflows/updatecli.yml
@@ -28,6 +28,8 @@ jobs:
           permission-pull-requests: write
           repositories: |
             docs-builder
+            edot-cloud-forwarder-aws
+            edot-cloud-forwarder-azure
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
diff --git a/config/versions.yml b/config/versions.yml
index 4f301f96f..6882d7efb 100644
--- a/config/versions.yml
+++ b/config/versions.yml
@@ -101,6 +101,9 @@ versioning_systems:
   edot-cf-azure:
     base: 0.1
     current: 0.6.0
+#  edot-cf-gcp:
+#    base: 0.1
+#    current: 0.1.0
 
   # Logging
   ecs-logging-dotnet: