diff --git a/bin/never_alone/create_never_alone_trail.sh b/bin/never_alone/create_never_alone_trail.sh
index efa422495..fbc253d0b 100755
--- a/bin/never_alone/create_never_alone_trail.sh
+++ b/bin/never_alone/create_never_alone_trail.sh
@@ -258,8 +258,8 @@ function attest_never_alone_trail_to_parent
 function main
 {
     check_arguments "$@"
-    # Use gh instead of git so we can keep the commit depth of 1. The order are from oldest commit to newest
-    local -r commits=($(gh api repos/:owner/:repo/compare/${START_COMMIT_SHA}...${END_COMMIT_SHA} -q '.commits[].sha'))
+    # Only get commits on main branch.
+    local -r commits=($(git rev-list --first-parent ${START_COMMIT_SHA}...${END_COMMIT_SHA}))
 
     begin_trail_with_template ${FLOW_NAME} ${TRAIL_NAME} "${commits[@]}"
     
diff --git a/release-flow-template.yml b/release-flow-template.yml
index dc67d14e1..61d09b6ad 100644
--- a/release-flow-template.yml
+++ b/release-flow-template.yml
@@ -5,8 +5,10 @@ trail:
     type: generic
   - name: test
     type: junit
-  - name: snyk-code
-    type: snyk
+#  - name: snyk-code
+#    type: snyk
+  - name: never-alone-trail
+    type: generic
   artifacts:
   - name: cli-docker
     attestations: