diff --git a/.github/workflows/composite/buildSetup/action.yml b/.github/workflows/composite/buildSetup/action.yml
index 0534053a..50534158 100644
--- a/.github/workflows/composite/buildSetup/action.yml
+++ b/.github/workflows/composite/buildSetup/action.yml
@@ -5,11 +5,11 @@ runs:
   using: "composite"
   steps:
   - name: Optionally set BUILD_SUFFIX
-	# Determine if this is a debug build, defaulting to true if
-	# the github inputs aren't present, as is the case for
-	# automatically triggered runs.
-	# See https://dev.to/mrmike/github-action-handling-input-default-value-5f2g.
-  	INPUT_IS_DEBUG_BUILD=${{ github.event.inputs.debug-build }}
+    # Determine if this is a debug build, defaulting to true if
+    # the github inputs aren't present, as is the case for
+    # automatically triggered runs.
+    # See https://dev.to/mrmike/github-action-handling-input-default-value-5f2g.
+    INPUT_IS_DEBUG_BUILD=${{ github.event.inputs.debug-build }}
     IS_DEBUG_BUILD=${INPUT_IS_DEBUG_BUILD:-"true"}
 
     shell: bash
@@ -40,9 +40,13 @@ runs:
       apt-get update -qq
       apt-get install -y dotnet-sdk-7.0
   - name: Set FOLDER_NAME
+    # As with the IS_DEBUG_BUILD arg, provide a default for CI runs.
+    INPUT_FOLDER_SUFFIX=${{ github.event.inputs.folder-suffix }}
+    FOLDER_SUFFIX=${INPUT_FOLDER_SUFFIX:-"automatic_build"}
+
     shell: bash
     run: |
-      echo "FOLDER_NAME=${EXPORT_NAME}${{ github.event.inputs.folder-suffix }}${GH_USERNAME}${BUILD_TIME}" >> $GITHUB_ENV
+      echo "FOLDER_NAME=${EXPORT_NAME}${{ FOLDER_SUFFIX }}${GH_USERNAME}${BUILD_TIME}" >> $GITHUB_ENV
   - name: Setup
     shell: bash
     run: |