diff --git a/.github/workflows/binary_provenance.yml b/.github/workflows/binary_provenance.yml
index 378a789ed..9f553534c 100644
--- a/.github/workflows/binary_provenance.yml
+++ b/.github/workflows/binary_provenance.yml
@@ -122,12 +122,12 @@ jobs:
           env:
             KOSLI_API_TOKEN: ${{ secrets.kosli_api_token }}
           run:
-            kosli attest generic
+            kosli attest sbom
               --flow ${{ inputs.flow_name }}
               --trail ${{ inputs.trail_name }}
               --name sbom
               --fingerprint ${{ env.FINGERPRINT }}
-              --attachments  ${{matrix.artifact.template_name}}-sbom.spdx.json
+              --sbom-file ${{matrix.artifact.template_name}}-sbom.spdx.json
               --external-url sigstore=https://search.sigstore.dev/?logIndex=${{ env.SBOM_TLOG_INDEX }}
               --org ${{ inputs.kosli_org }}
 
@@ -135,13 +135,12 @@ jobs:
           env:
             KOSLI_API_TOKEN: ${{ secrets.kosli_api_token }}
           run:
-            kosli attest custom
+            kosli attest sbom
               --flow ${{ inputs.flow_name }}
               --trail ${{ inputs.trail_name }}
               --name cyclone-dx-sbom
-              --type cyclone-dx-1-6
               --fingerprint ${{ env.FINGERPRINT }}
-              --attestation-data ${{matrix.artifact.template_name}}-sbom.cyclonedx.json
+              --sbom-file ${{matrix.artifact.template_name}}-sbom.cyclonedx.json
               --org ${{ inputs.kosli_org }}
 
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7f00249d4..b0c865e97 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -327,12 +327,12 @@ jobs:
         env:
           KOSLI_API_TOKEN: ${{ secrets.kosli_api_token }}
         run:
-          kosli attest generic
+          kosli attest sbom
             --flow ${{ inputs.flow_name }}
             --trail ${{ inputs.trail_name }}
             --name container-sbom
             --fingerprint ${{ env.FINGERPRINT }}
-            --attachments sbom.spdx.json
+            --sbom-file sbom.spdx.json
             --org ${{ inputs.kosli_org }}
 
       - name: Run Snyk Container Test to scan the Docker image for vulnerabilities
diff --git a/main-flow-template.yml b/main-flow-template.yml
index 419f8f3a2..f84352ef3 100644
--- a/main-flow-template.yml
+++ b/main-flow-template.yml
@@ -23,4 +23,4 @@ trail:
     - name: smoke-test
       type: generic
     - name: container-sbom
-      type: generic
+      type: "*"
diff --git a/release-flow-template.yml b/release-flow-template.yml
index b3124fd19..b634df233 100644
--- a/release-flow-template.yml
+++ b/release-flow-template.yml
@@ -17,59 +17,59 @@ trail:
     - name: smoke-test
       type: generic
     - name: container-sbom
-      type: generic
+      type: "*"
 
   - name: linux-arm
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: windows-arm64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: darwin-arm64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: linux-arm64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: linux-amd64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: windows-amd64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: darwin-amd64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: rpm-pkg-amd64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: rpm-pkg-arm64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: rpm-pkg-arm
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: deb-pkg-arm64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: deb-pkg-arm
     attestations:
     - name: sbom
-      type: generic
+      type: "*"
   - name: deb-pkg-amd64
     attestations:
     - name: sbom
-      type: generic
+      type: "*"