diff --git a/internal/fod-login/action.yml b/internal/fod-login/action.yml
index 82a3275..4e8963d 100644
--- a/internal/fod-login/action.yml
+++ b/internal/fod-login/action.yml
@@ -11,8 +11,8 @@ runs:
       if: ${{ !env._FOD_LOGGED_IN }}
       with:
         dir: ${{ github.action_path }}
-        script: ./fod-login.sh
-        post: ./fod-logout.sh
+        script: fod-login.sh
+        post: fod-logout.sh
           
 branding:
   icon: 'shield'
diff --git a/internal/run-script-js/main.js b/internal/run-script-js/main.js
deleted file mode 100644
index 57d111c..0000000
--- a/internal/run-script-js/main.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const { spawn } = require("child_process");
-const { appendFileSync } = require("fs");
-const { EOL } = require("os");
-
-function run(script) {
-  if ( script ) {
-      const dir = process.env.INPUT_DIR;
-      const utilDir = process.env.INPUT_UTIL;
-      const subprocess = spawn(`bash -c -o pipefail -v 'export UTIL_DIR=${utilDir}; ${dir}/${script}'`, 
-        { stdio: "inherit", shell: true });
-      subprocess.on("exit", (exitCode) => {
-        process.exitCode = exitCode;
-      });
-  }
-}
-
-const key = process.env.INPUT_KEY.toUpperCase();
-
-if ( process.env[`STATE_${key}`] !== undefined ) { // Are we in the 'post' step?
-  run(process.env.INPUT_POST);
-} else { // Otherwise, this is the main step
-  appendFileSync(process.env.GITHUB_STATE, `${key}=true${EOL}`);
-  run(process.env.INPUT_SCRIPT);
-}
diff --git a/internal/run-script/README.md b/internal/run-script/README.md
new file mode 100644
index 0000000..cfd3537
--- /dev/null
+++ b/internal/run-script/README.md
@@ -0,0 +1,34 @@
+# fortify/github-action/internal/run-script
+
+This action can run any of the scripts located in the `scripts` directory of this action, including the ability to run post-job scripts, for example to handle session logout.
+
+```yaml
+    - uses: fortify/github-action/internal/run-script@v1
+      with:
+        script: <script name>
+        post:   <post-job script name>
+```
+
+Originally, the idea was to have these scripts located in each individual action directory, for example having `ssc-login.sh` and `ssc-logout.sh` scripts located in the `internal/ssc-login` directory. However, this proved to be difficult/impossible:
+
+- As scripts need to be run using `bash` (also on Windows), we need to convert `${{github.action_path}}` (which may include drive letter and backslashes on Windows) to `bash` format; an example of how this can be done is shown in `action.yml`.
+- GitHub lazily evaluates action inputs when running the post-job actions, but doesn't re-run any steps used to generate those inputs.
+
+So, suppose we'd generate a `BASH_ACTION_PATH` environment variable that contains `${{github.action_path}}` in `bash` format, we'd expect to be able to use something like:
+
+```yaml
+    - uses: fortify/github-action/internal/run-script/js@feat-1.3.0
+      with: 
+        script: ${{ env.BASH_ACTION_PATH }}/ssc-login.sh
+        post:   ${{ env.BASH_ACTION_PATH }}/ssc-logout.sh
+```
+
+This works fine for `script:`, but the `post:` script would use whatever the value of `BASH_ACTION_PATH` is during post-job execution. So, if we'd run both `ssc-login` and `sc-sast-login` actions, the post-job action would try to run `../internal/sc-sast-login/ssc-logout.sh`, which would fail because of the incorrect directory name.
+
+Several work-arounds were tried, but failed. Only way that this would likely work is to have the calling action pass something like a static action id, which would then be used by this action to set a `POST_<id>_SCRIPT=${{inputs.POST}}` environment variable. During post-job execution, we wouldn't look at any actual inputs, but instead just execute the script identified in the `POST_<id>_SCRIPT` environment variable.
+
+Apart from hosting the scripts together with the action that executes them, another advantage of such an id is that we can also provide out-of-the-box support for run-once actions, like the various `login` actions; this is currently handled by setting an environment variable in the `*-login.sh` and `*-logout.sh` scripts. As we may also have scripts that may need to be run multiple times, we should control this through a `run-once: true|false` input.
+
+Disadvantage, apart from slightly more complex implementation, is that each caller of this `run-script` action would also need to provide the value of `${{ github.action_path }}` as an input to this action, in order to have this action determine appropriate script location.
+
+
diff --git a/internal/run-script/action.yml b/internal/run-script/action.yml
index ad8ed16..1edeee3 100644
--- a/internal/run-script/action.yml
+++ b/internal/run-script/action.yml
@@ -15,21 +15,14 @@ inputs:
 runs:
   using: composite
   steps:
-    # github.action_path uses platform-specific path format, like D:\... for Windows.
-    # The run-script-js action requires the path to be in bash format, so we convert
-    # the paths to bash format before invoking the run-script-js action.
-    - run: echo "BASH_SCRIPT_DIR=$(pwd)" >> $GITHUB_ENV
-      shell: bash
-      working-directory: ${{ inputs.dir }}
-    - run: echo "BASH_UTIL_DIR=$(pwd)/util" >> $GITHUB_ENV
+    - run: echo "_RUN_SCRIPTS_DIR=$(pwd)/scripts" >> $GITHUB_ENV
       shell: bash
       working-directory: ${{ github.action_path }}
-    - uses: fortify/github-action/internal/run-script-js@feat-1.3.0
+    - uses: fortify/github-action/internal/run-script/js@feat-1.3.0
       with: 
-        util: ${{ env.BASH_UTIL_DIR }}
-        dir: ${{ env.BASH_SCRIPT_DIR }}
+        dir:    ${{ env._RUN_SCRIPTS_DIR }}
         script: ${{ inputs.script }}
-        post: ${{ inputs.post }}
+        post:   ${{ inputs.post }}
 
 branding:
   icon: 'shield'
diff --git a/internal/run-script-js/action.yml b/internal/run-script/js/action.yml
similarity index 55%
rename from internal/run-script-js/action.yml
rename to internal/run-script/js/action.yml
index b1055b9..1eafef1 100644
--- a/internal/run-script-js/action.yml
+++ b/internal/run-script/js/action.yml
@@ -10,17 +10,10 @@ inputs:
     description: 'Script to run on job completion'
     required: false
   dir:
-    description: 'Directory where scripts are located, should usually be set to github.action_path'
+    description: 'Directory where scripts are located, set automatically by internal/run-script action'
     required: true
-  util:
-    description: 'Directory where utility scripts are located, set automatically by internal/run-script action'
-    required: true
-  key:
-    description: 'Name of the state variable used to detect the post step.'
-    required: false
-    default: POST
 
 runs:
   using: 'node20'
   main: 'main.js'
-  post: 'main.js'
+  post: 'post.js'
diff --git a/internal/run-script/js/main.js b/internal/run-script/js/main.js
new file mode 100644
index 0000000..c2f8fa8
--- /dev/null
+++ b/internal/run-script/js/main.js
@@ -0,0 +1,3 @@
+const util = require("./util");
+
+util.run(process.env.INPUT_SCRIPT);
diff --git a/internal/run-script-js/package-lock.json b/internal/run-script/js/package-lock.json
similarity index 100%
rename from internal/run-script-js/package-lock.json
rename to internal/run-script/js/package-lock.json
diff --git a/internal/run-script/js/post.js b/internal/run-script/js/post.js
new file mode 100644
index 0000000..b394c66
--- /dev/null
+++ b/internal/run-script/js/post.js
@@ -0,0 +1,3 @@
+const util = require("./util");
+
+util.run(process.env.INPUT_POST);
diff --git a/internal/run-script/js/util.js b/internal/run-script/js/util.js
new file mode 100644
index 0000000..f502fde
--- /dev/null
+++ b/internal/run-script/js/util.js
@@ -0,0 +1,12 @@
+const { spawn } = require("child_process");
+
+exports.run = function(script) {
+  if ( script ) {
+      const scriptDir = process.env.INPUT_DIR;
+      const subprocess = spawn(`bash -c -o pipefail -v 'export UTIL_DIR=${scriptDir}; ${scriptDir}/${script}'`, 
+        { stdio: "inherit", shell: true });
+      subprocess.on("exit", (exitCode) => {
+        process.exitCode = exitCode;
+      });
+  }
+}
diff --git a/internal/run-script/util/common.sh b/internal/run-script/scripts/common.sh
similarity index 80%
rename from internal/run-script/util/common.sh
rename to internal/run-script/scripts/common.sh
index bbf6126..a033a0f 100644
--- a/internal/run-script/util/common.sh
+++ b/internal/run-script/scripts/common.sh
@@ -5,4 +5,9 @@ fi
 if [ -z "$FCLI_CMD" ]; then
   echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
   exit 1;
-fi
\ No newline at end of file
+fi
+
+function run {
+  echo RUN: "$@"
+  "$@" 
+}
diff --git a/internal/fod-login/fod-login.sh b/internal/run-script/scripts/fod-login.sh
similarity index 84%
rename from internal/fod-login/fod-login.sh
rename to internal/run-script/scripts/fod-login.sh
index 4e8c7a2..8b6c9c4 100755
--- a/internal/fod-login/fod-login.sh
+++ b/internal/run-script/scripts/fod-login.sh
@@ -12,5 +12,6 @@ else
   echo "ERROR: Either FOD_CLIENT_ID and FOD_CLIENT_SECRET, or FOD_TENANT, FOD_USER and FOD_PASSWORD environment variables must be set"
   exit 1;
 fi
-${FCLI_CMD} fod session login --url "${FOD_URL}" "${_FOD_AUTH_OPTS[@]}" ${EXTRA_FOD_LOGIN_OPTS} || exit 1
+run ${FCLI_CMD} fod session login --url "${FOD_URL}" "${_FOD_AUTH_OPTS[@]}" ${EXTRA_FOD_LOGIN_OPTS} \
+  || exit 1
 echo '_FOD_LOGGED_IN=true' >> $GITHUB_ENV 
\ No newline at end of file
diff --git a/internal/fod-login/fod-logout.sh b/internal/run-script/scripts/fod-logout.sh
similarity index 70%
rename from internal/fod-login/fod-logout.sh
rename to internal/run-script/scripts/fod-logout.sh
index 9efbef9..405c9e2 100755
--- a/internal/fod-login/fod-logout.sh
+++ b/internal/run-script/scripts/fod-logout.sh
@@ -3,5 +3,6 @@
 
 if [[ "${_FOD_LOGGED_IN}" == "true" ]]; then
   echo '_FOD_LOGGED_IN=false' >> $GITHUB_ENV
-  ${FCLI_CMD} fod session logout || exit 1
+  run ${FCLI_CMD} fod session logout \
+    || exit 1
 fi
\ No newline at end of file
diff --git a/internal/sc-sast-login/sc-sast-login.sh b/internal/run-script/scripts/sc-sast-login.sh
similarity index 72%
rename from internal/sc-sast-login/sc-sast-login.sh
rename to internal/run-script/scripts/sc-sast-login.sh
index 90cdf76..dbe761f 100755
--- a/internal/sc-sast-login/sc-sast-login.sh
+++ b/internal/run-script/scripts/sc-sast-login.sh
@@ -10,5 +10,6 @@ fi
 if [ -z "SSC_TOKEN" ]; then
   echo "ERROR: SSC_TOKEN environment variable must be set"; exit 1;
 fi
-${FCLI_CMD} sc-sast session login --ssc-url "${SSC_URL}" -t "${SSC_TOKEN}" -c "${SC_SAST_TOKEN}" ${EXTRA_SC_SAST_LOGIN_OPTS}
+run ${FCLI_CMD} sc-sast session login --ssc-url "${SSC_URL}" -t "${SSC_TOKEN}" -c "${SC_SAST_TOKEN}" ${EXTRA_SC_SAST_LOGIN_OPTS} \
+  || exit 1
 echo '_SC_SAST_LOGGED_IN=true' >> $GITHUB_ENV 
\ No newline at end of file
diff --git a/internal/sc-sast-login/sc-sast-logout.sh b/internal/run-script/scripts/sc-sast-logout.sh
similarity index 64%
rename from internal/sc-sast-login/sc-sast-logout.sh
rename to internal/run-script/scripts/sc-sast-logout.sh
index a6f814a..dea2b55 100755
--- a/internal/sc-sast-login/sc-sast-logout.sh
+++ b/internal/run-script/scripts/sc-sast-logout.sh
@@ -3,5 +3,6 @@
 
 if [[ "${_SC_SAST_LOGGED_IN}" == "true" ]]; then
   echo '_SC_SAST_LOGGED_IN=false' >> $GITHUB_ENV
-  ${FCLI_CMD} sc-sast session logout --no-revoke-token || exit 1
+  run ${FCLI_CMD} sc-sast session logout --no-revoke-token \
+    || exit 1
 fi
\ No newline at end of file
diff --git a/internal/ssc-login/ssc-login.sh b/internal/run-script/scripts/ssc-login.sh
similarity index 80%
rename from internal/ssc-login/ssc-login.sh
rename to internal/run-script/scripts/ssc-login.sh
index 037a333..b8b506a 100755
--- a/internal/ssc-login/ssc-login.sh
+++ b/internal/run-script/scripts/ssc-login.sh
@@ -11,5 +11,6 @@ elif [ -n "${SSC_USER}" -a -n "${SSC_PASSWORD}" ]; then
 else
   echo "ERROR: Either SSC_TOKEN, or SSC_USER and SSC_PASSWORD environment variables must be set"; exit 1;
 fi
-${FCLI_CMD} ssc session login --url "${SSC_URL}" "${_SSC_AUTH_OPTS[@]}" ${EXTRA_SSC_LOGIN_OPTS}
+run ${FCLI_CMD} ssc session login --url "${SSC_URL}" "${_SSC_AUTH_OPTS[@]}" ${EXTRA_SSC_LOGIN_OPTS} \
+  || exit 1
 echo '_SSC_LOGGED_IN=true' >> $GITHUB_ENV 
\ No newline at end of file
diff --git a/internal/ssc-login/ssc-logout.sh b/internal/run-script/scripts/ssc-logout.sh
similarity index 85%
rename from internal/ssc-login/ssc-logout.sh
rename to internal/run-script/scripts/ssc-logout.sh
index 5dbff85..0818f46 100755
--- a/internal/ssc-login/ssc-logout.sh
+++ b/internal/run-script/scripts/ssc-logout.sh
@@ -10,5 +10,6 @@ if [[ "${_SSC_LOGGED_IN}" == "true" ]]; then
   else
     echo "ERROR: Either SSC_TOKEN, or SSC_USER and SSC_PASSWORD environment variables must be set"; exit 1;
   fi
-  ${FCLI_CMD} ssc session logout "${_SSC_LOGOUT_OPTS[@]}" || exit 1
+  run ${FCLI_CMD} ssc session logout "${_SSC_LOGOUT_OPTS[@]}" \
+    || exit 1
 fi
\ No newline at end of file
diff --git a/internal/run-script/scripts/ssc-scan.sh b/internal/run-script/scripts/ssc-scan.sh
new file mode 100755
index 0000000..b2dad30
--- /dev/null
+++ b/internal/run-script/scripts/ssc-scan.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+. ${UTIL_DIR}/common.sh
+
+# This script assumes that fcli and Debricked CLI have already been installed,
+# and that any necessary fcli sessions have been created.
+# TODO Check prerequisites like SSC_APPVERSION, DEBRICKED_TOKEN, ...
+
+if [ "${DO_SC_SAST_SCAN}" == "true" ]; then
+  run ${FCLI_CMD} sc-sast scan start --publish-to "${SSC_APPVERSION}" -p package.zip -v "${SC_SAST_SENSOR_VERSION}" --store sc_sast_scan ${EXTRA_SC_SAST_SCAN_OPTS} \
+    || exit 1
+fi
+if [ "${DO_DEBRICKED_SCAN}" == "true" ]; then
+  # Debricked may return non-zero exit code on automation rule failures, in which case
+  # we still want to run subsequent steps, hence we temporarily ignore the exit code,
+  run ${DEBRICKED_CLI_CMD} scan -t "${DEBRICKED_TOKEN}" -i "Fortify GitHub Action" \
+    || FAIL_ON_EXIT=true
+  run ${FCLI_CMD} ssc artifact import-debricked --av "${SSC_APPVERSION}" --repository "${GITHUB_REPOSITORY}" --branch "${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}" -t "${DEBRICKED_TOKEN}" --store debricked_scan \
+    || exit 1
+fi
+if [ "${DO_WAIT}" == "true" ] || [ "${DO_EXPORT}" == "true" ]; then
+  if [ "${DO_SC_SAST_SCAN}" == "true" ]; then
+    run ${FCLI_CMD} sc-sast scan wait-for ::sc_sast_scan:: \
+      || exit 1
+  fi
+  if [ "${DO_DEBRICKED_SCAN}" == "true" ]; then 
+    run ${FCLI_CMD} ssc artifact wait-for ::debricked_scan:: \
+      || exit 1
+  fi
+fi
+if [ "${FAIL_ON_EXIT}" == "true" ]; then
+  echo "Earlier failures detected"
+  exit 1
+fi
diff --git a/internal/sc-sast-login/action.yml b/internal/sc-sast-login/action.yml
index 1d6010e..950cace 100644
--- a/internal/sc-sast-login/action.yml
+++ b/internal/sc-sast-login/action.yml
@@ -15,8 +15,8 @@ runs:
       if: ${{ !env._SC_SAST_LOGGED_IN }}
       with:
         dir: ${{ github.action_path }}
-        script: ./sc-sast-login.sh
-        post: ./sc-sast-logout.sh
+        script: sc-sast-login.sh
+        post: sc-sast-logout.sh
             
 branding:
   icon: 'shield'
diff --git a/internal/ssc-login/action.yml b/internal/ssc-login/action.yml
index 7e5412a..38c90a4 100644
--- a/internal/ssc-login/action.yml
+++ b/internal/ssc-login/action.yml
@@ -11,8 +11,8 @@ runs:
       if: ${{ !env._SSC_LOGGED_IN }}
       with:
         dir: ${{ github.action_path }}
-        script: ./ssc-login.sh
-        post: ./ssc-logout.sh
+        script: ssc-login.sh
+        post: ssc-logout.sh
 branding:
   icon: 'shield'
   color: 'blue'
diff --git a/ssc-scan/action.yml b/ssc-scan/action.yml
new file mode 100644
index 0000000..7b15573
--- /dev/null
+++ b/ssc-scan/action.yml
@@ -0,0 +1,25 @@
+name: 'Perform SAST scan'
+description: 'Perform a SAST scan on ScanCentral SAST'
+author: 'Fortify'
+runs:
+  using: composite
+  steps:
+    - uses: fortify/github-action/setup@feat-1.3.0
+      with:
+        export-path: false
+        fcli: action-default
+        debricked-cli: ${{ env.DO_DEBRICKED_SCAN=='true' && 'action-default' || 'skip' }}
+    - uses: fortify/github-action/internal/ssc-login@feat-1.3.0
+    - uses: fortify/github-action/internal/sc-sast-login@feat-1.3.0
+    - uses: fortify/github-action/package@feat-1.3.0
+    - uses: fortify/github-action/internal/run-script@feat-1.3.0
+      with:
+        dir: ${{ github.action_path }}
+        script: ssc-scan.sh
+    - if: env.DO_EXPORT == 'true'
+      uses: fortify/github-action/ssc-export@feat-1.3.0
+        
+branding:
+  icon: 'shield'
+  color: 'blue'
+