From 93113baa1b55c73232f6ba9042b5345248d07cad Mon Sep 17 00:00:00 2001
From: Alvaro Vidal Torreira <avidalto@hawk.iit.edu>
Date: Thu, 12 Mar 2026 12:31:00 +0100
Subject: [PATCH] Revert "Update noaa sessions to use script submitter v3.6
 (#736)"

This reverts commit 15ae762ef0cf6d20cb7d36a0263911dd202e8350.
---
 workflow/yamls/jupyter-host/noaa_v4.yaml      | 22 +++++++++----------
 workflow/yamls/jupyterlab-host/noaa_v4.yaml   | 22 +++++++++----------
 workflow/yamls/kasmvnc-container/noaa.yaml    | 22 +++++++++----------
 workflow/yamls/openvscode/noaa_v4.yaml        | 22 +++++++++----------
 .../yamls/vncserver/noaa-armforge_v4.yaml     | 22 +++++++++----------
 workflow/yamls/vncserver/noaa-matlab_v4.yaml  | 22 +++++++++----------
 workflow/yamls/vncserver/noaa-rstudio_v4.yaml | 22 +++++++++----------
 workflow/yamls/vncserver/noaa_v4.yaml         | 22 +++++++++----------
 workflow/yamls/webshell/noaa_v4.yaml          | 22 +++++++++----------
 9 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/workflow/yamls/jupyter-host/noaa_v4.yaml b/workflow/yamls/jupyter-host/noaa_v4.yaml
index bc91249a..46f8b321 100644
--- a/workflow/yamls/jupyter-host/noaa_v4.yaml
+++ b/workflow/yamls/jupyter-host/noaa_v4.yaml
@@ -58,7 +58,7 @@ jobs:
     ssh:
         remoteHost: ${{ inputs.resource.ip }}
     steps:
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -66,7 +66,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ inputs.cluster.slurm.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -75,7 +75,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -108,14 +108,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -166,11 +166,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/jupyterlab-host/noaa_v4.yaml b/workflow/yamls/jupyterlab-host/noaa_v4.yaml
index ab0b6d4a..31363634 100644
--- a/workflow/yamls/jupyterlab-host/noaa_v4.yaml
+++ b/workflow/yamls/jupyterlab-host/noaa_v4.yaml
@@ -61,7 +61,7 @@ jobs:
     ssh:
         remoteHost: ${{ inputs.resource.ip }}
     steps:
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -69,7 +69,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ inputs.cluster.slurm.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -78,7 +78,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -111,14 +111,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -169,11 +169,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/kasmvnc-container/noaa.yaml b/workflow/yamls/kasmvnc-container/noaa.yaml
index 601709d0..d2ac8865 100644
--- a/workflow/yamls/kasmvnc-container/noaa.yaml
+++ b/workflow/yamls/kasmvnc-container/noaa.yaml
@@ -56,7 +56,7 @@ jobs:
     ssh:
       remoteHost: ${{ inputs.resource.ip }}
     steps:
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -64,7 +64,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ inputs.cluster.slurm.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -73,7 +73,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.container_runtime }}/start-template-v3.sh
@@ -115,14 +115,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -173,11 +173,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/openvscode/noaa_v4.yaml b/workflow/yamls/openvscode/noaa_v4.yaml
index 044da56c..d4280b89 100644
--- a/workflow/yamls/openvscode/noaa_v4.yaml
+++ b/workflow/yamls/openvscode/noaa_v4.yaml
@@ -54,7 +54,7 @@ jobs:
     ssh:
         remoteHost: ${{ inputs.resource.ip }}
     steps:
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -62,7 +62,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ inputs.cluster.slurm.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -71,7 +71,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -104,14 +104,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -162,11 +162,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/vncserver/noaa-armforge_v4.yaml b/workflow/yamls/vncserver/noaa-armforge_v4.yaml
index c34f1755..08d045ee 100644
--- a/workflow/yamls/vncserver/noaa-armforge_v4.yaml
+++ b/workflow/yamls/vncserver/noaa-armforge_v4.yaml
@@ -71,7 +71,7 @@ jobs:
             echo "partition=${{ inputs.cluster.slurm.partition_tag_cloud }}" | tee -a $OUTPUTS
           fi
 
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -79,7 +79,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ needs.session_runner.outputs.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -88,7 +88,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -121,14 +121,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -201,11 +201,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/vncserver/noaa-matlab_v4.yaml b/workflow/yamls/vncserver/noaa-matlab_v4.yaml
index 96dc09d6..58b2d480 100644
--- a/workflow/yamls/vncserver/noaa-matlab_v4.yaml
+++ b/workflow/yamls/vncserver/noaa-matlab_v4.yaml
@@ -70,7 +70,7 @@ jobs:
             echo "partition=${{ inputs.cluster.slurm.partition_tag_cloud }}" | tee -a $OUTPUTS
           fi
 
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -78,7 +78,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ needs.session_runner.outputs.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -87,7 +87,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -120,14 +120,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -200,11 +200,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/vncserver/noaa-rstudio_v4.yaml b/workflow/yamls/vncserver/noaa-rstudio_v4.yaml
index 580a2b00..5d037183 100644
--- a/workflow/yamls/vncserver/noaa-rstudio_v4.yaml
+++ b/workflow/yamls/vncserver/noaa-rstudio_v4.yaml
@@ -71,7 +71,7 @@ jobs:
             echo "partition=${{ inputs.cluster.slurm.partition_tag_cloud }}" | tee -a $OUTPUTS
           fi
 
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -79,7 +79,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ needs.session_runner.outputs.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -88,7 +88,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -121,14 +121,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -201,11 +201,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/vncserver/noaa_v4.yaml b/workflow/yamls/vncserver/noaa_v4.yaml
index e3aca05b..024b6226 100644
--- a/workflow/yamls/vncserver/noaa_v4.yaml
+++ b/workflow/yamls/vncserver/noaa_v4.yaml
@@ -67,7 +67,7 @@ jobs:
             echo "partition=${{ inputs.cluster.slurm.partition_tag_cloud }}" | tee -a $OUTPUTS
           fi
 
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -75,7 +75,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ needs.session_runner.outputs.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -84,7 +84,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -117,14 +117,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -197,11 +197,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor
diff --git a/workflow/yamls/webshell/noaa_v4.yaml b/workflow/yamls/webshell/noaa_v4.yaml
index 68e7ba2e..a2f53df4 100644
--- a/workflow/yamls/webshell/noaa_v4.yaml
+++ b/workflow/yamls/webshell/noaa_v4.yaml
@@ -45,7 +45,7 @@ jobs:
     ssh:
         remoteHost: ${{ inputs.resource.ip }}
     steps:
-      - uses: marketplace/session_runner/v1.4
+      - uses: marketplace/session_runner/v1.3
         early-cancel: any-job-failed
         with:
           session: ${{ sessions.session }}
@@ -53,7 +53,7 @@ jobs:
           cluster:
             scheduler: ${{ inputs.cluster.scheduler }}
             slurm:
-              is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
+              is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false  }}
               account: ${{ inputs.cluster.slurm.account }}
               partition: ${{ inputs.cluster.slurm.partition }}
               qos: ${{ inputs.cluster.slurm.qos }}
@@ -62,7 +62,7 @@ jobs:
               scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
               time: ${{ inputs.cluster.slurm.time }}
             pbs:
-              is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
+              is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
               scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
           service:
             start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
@@ -94,14 +94,14 @@ jobs:
           slurm:
             type: group
             label: SLURM Directives
-            hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
-            ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+            ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
+                default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
+                label: Is SLURM disabled?
               account:
                 label: SLURM account
                 type: slurm-accounts
@@ -152,11 +152,11 @@ jobs:
             hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
             items:
-              is_enabled:
+              is_disabled:
                 type: boolean
                 hidden: true
-                default: true
-                label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
+                default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
+                label: Is PBS disabled?
               scheduler_directives:
                 label: Scheduler Directives
                 type: editor