diff --git a/action.yaml b/action.yaml
index 4ba7cd7..415d1c7 100644
--- a/action.yaml
+++ b/action.yaml
@@ -392,6 +392,11 @@ runs:
           if [[ "${{ inputs.description }}" != "" ]]; then
             options="$options --description '${{ inputs.description }}'"
           fi
+
+          # Add workspace-id option for organization API tokens
+          if [[ "${{ inputs.workspace }}" != "" ]]; then
+            options="$options --workspace-id ${{ inputs.workspace }}"
+          fi
         fi
 
         echo "DBT_DEPLOY=$DBT_DEPLOY" >> $GITHUB_OUTPUT
@@ -529,6 +534,11 @@ runs:
           options="$options --build-secrets '${{ inputs.build-secrets }}'"
         fi
 
+        # Add workspace-id option for organization API tokens
+        if [[ "${{ inputs.workspace }}" != '' ]]; then
+          options="$options --workspace-id ${{ inputs.workspace }}"
+        fi
+
         echo "OPTIONS=$options" >> $GITHUB_OUTPUT
         echo ::endgroup::
       shell: bash