diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c3c84da..c629688e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,7 +49,7 @@ jobs:
       FLOW_TEMPLATE_FILE: ${{ needs.pre-build.outputs.trail_template_file }}
       KOSLI_ORG: kosli-public
     secrets:
-      kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+      kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
       pr_github_token: ${{ secrets.GITHUB_TOKEN }}
 
 
@@ -73,7 +73,7 @@ jobs:
       slack_webhook: ${{ secrets.MERKELY_SLACK_CI_FAILURES_WEBHOOK }}
       slack_channel: ${{ secrets.MERKELY_SLACK_CI_FAILURES_CHANNEL }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
-      kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+      kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
 
   docker:
     needs: [pre-build, test, init-kosli]
@@ -89,5 +89,5 @@ jobs:
       slack_channel: ${{ secrets.MERKELY_SLACK_CI_FAILURES_CHANNEL }} 
       ghcr_user: ${{ secrets.GHCR_USER }}
       ghcr_token: ${{ secrets.GHCR_TOKEN }}
-      kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+      kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60f702dd..ab497123 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
         FLOW_TEMPLATE_FILE: ${{ needs.pre-build.outputs.trail_template_file }}
         KOSLI_ORG: kosli-public
       secrets:
-        kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+        kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
         pr_github_token: ${{ secrets.GITHUB_TOKEN }}
 
   never-alone-trail:
@@ -59,7 +59,7 @@ jobs:
         PARENT_TRAIL_NAME: ${{ needs.pre-build.outputs.trail_name }}
         KOSLI_ORG: kosli-public
       secrets:
-        kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+        kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
         pr_github_token: ${{ secrets.GITHUB_TOKEN }}        
 
   test:
@@ -82,7 +82,7 @@ jobs:
       slack_channel: ${{ secrets.MERKELY_SLACK_CI_FAILURES_CHANNEL }}
       jira_api_token: ${{ secrets.KOSLI_JIRA_API_TOKEN }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
-      kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+      kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
 
   docker:
     needs: [pre-build, init-kosli, test, never-alone-trail]
@@ -98,7 +98,7 @@ jobs:
       slack_channel: ${{ secrets.MERKELY_SLACK_CI_FAILURES_CHANNEL }} 
       ghcr_user: ${{ secrets.GHCR_USER }}
       ghcr_token: ${{ secrets.GHCR_TOKEN }}
-      kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+      kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
 
   goreleaser:
@@ -168,7 +168,7 @@ jobs:
       trail_name: ${{ needs.pre-build.outputs.trail_name }}
       kosli_org: kosli-public
     secrets:
-      kosli_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
+      kosli_api_token: ${{ secrets.KOSLI_PUBLIC_API_TOKEN }}
 
   homebrew-pr:
     needs: [goreleaser, pre-build]
diff --git a/secrets/gh-repo-kosli-public-api-token.txt b/secrets/gh-repo-kosli-public-api-token.txt
new file mode 100644
index 00000000..3635ec28
--- /dev/null
+++ b/secrets/gh-repo-kosli-public-api-token.txt
@@ -0,0 +1,15 @@
+secret-name: KOSLI_PUBLIC_API_TOKEN
+secret-expire: 2025-09-25
+secret-updated: 2024-09-25
+secret-updated-by: tore
+secret-type: gh-repo
+is-secret: true
+secret-usage: Secret used to report CLI builds to
+https://app.kosli.com/kosli-public
+
+update-instructions:
+Get new API key from https://app.kosli.com/kosli-public/settings/service-accounts#ci-user
+This is the api-key for the ci-user.
+
+Go to https://github.com/kosli-dev/cli/settings/secrets/actions
+under <Repository secrets>