diff --git a/gitea/gitea-query-package-versions-latest/action.yaml b/gitea/gitea-query-package-versions-latest/action.yaml
index 29d3ab2..e117ad6 100644
--- a/gitea/gitea-query-package-versions-latest/action.yaml
+++ b/gitea/gitea-query-package-versions-latest/action.yaml
@@ -61,6 +61,11 @@ runs:
       limit: ${{ inputs.limit }}
       name: ${{ inputs.name }}
       additionalArgs: ${{ inputs.additionalArgs }}
+  - name: "Echo versions."
+    run: |
+      echo "Versions:"
+      echo "${{ steps.versions.outputs.versions }}"
+    shell: bash
   - name: "Parse query result."
     id: parse
     uses: act/common/utils/get-latest-version@master
diff --git a/npm/npm-get-next-branched-version/action.yaml b/npm/npm-get-next-branched-version/action.yaml
index c16be0e..152c2af 100644
--- a/npm/npm-get-next-branched-version/action.yaml
+++ b/npm/npm-get-next-branched-version/action.yaml
@@ -43,6 +43,13 @@ runs:
     id: base
     with:
       version: ${{ inputs.defaultVersion }}
+  - name: "Debug - Base version info"
+    run: |
+      echo "Default version: '${{ inputs.defaultVersion }}'"
+      echo "Base version: '${{ steps.base.outputs.baseVersion }}'"
+      echo "Major.Minor.Patch version: '${{ steps.base.outputs.majorMinorPatchVersion }}'"
+      echo "Prerelease mode: '${{ inputs.prerelease }}'"
+    shell: bash
   - uses: act/common/gitea/gitea-query-package-versions-latest@master
     id: gitea
     with:
@@ -54,6 +61,12 @@ runs:
       filter: ^${{ steps.base.outputs.baseVersion }}
       filterIsExpression: "true"
       prerelease: ${{ inputs.prerelease }}
+  - name: "Debug - First query results"
+    run: |
+      echo "Query filter: '^${{ steps.base.outputs.baseVersion }}'"
+      echo "Found version: '${{ steps.gitea.outputs.version }}'"
+      echo "Will run fallback: ${{ steps.gitea.outputs.version == '' && inputs.prerelease != 'false' }}"
+    shell: bash
   - name: "If no version is found, get the latest version for the package if we didn't already look for it."
     uses: act/common/gitea/gitea-query-package-versions-latest@master
     id: giteaFallback
@@ -67,9 +80,22 @@ runs:
       filter: ^${{ steps.base.outputs.majorMinorPatchVersion }}
       filterIsExpression: "true"
       prerelease: "false"
+  - name: "Debug - Fallback query results"
+    if: ${{ steps.giteaFallback.conclusion != 'skipped' }}
+    run: |
+      echo "Fallback filter: '^${{ steps.base.outputs.majorMinorPatchVersion }}'"
+      echo "Fallback found version: '${{ steps.giteaFallback.outputs.version }}'"
+    shell: bash
   - name: "Get the next version for the package."
     uses: act/common/utils/version-increment-branch@master
     id: version
     with:
       incrementMode: ${{ inputs.incrementMode }}
       version: ${{ steps.gitea.outputs.version || steps.giteaFallback.outputs.version || inputs.defaultVersion }}
+  - name: "Debug - Final version info"
+    run: |
+      echo "Increment mode: '${{ inputs.incrementMode }}'"
+      echo "Base for increment: '${{ steps.gitea.outputs.version || steps.giteaFallback.outputs.version || inputs.defaultVersion }}'"
+      echo "Latest version (output): '${{ steps.gitea.outputs.version || steps.giteaFallback.outputs.version }}'"
+      echo "Next version (output): '${{ steps.version.outputs.nextVersion }}'"
+    shell: bash