diff --git a/.cicd/scripts/srw_ftest.sh b/.cicd/scripts/srw_ftest.sh
index 95530a89a..2cbe3dc0c 100755
--- a/.cicd/scripts/srw_ftest.sh
+++ b/.cicd/scripts/srw_ftest.sh
@@ -89,7 +89,7 @@ module use modulefiles
 module load build_${platform,,}_${SRW_COMPILER}
 module load wflow_${platform,,}
 # Deactivate conflicting conda env on GCP
-[[ "${SRW_PLATFORM}" =~ "gclusternoaa" ]] && conda deactivate
+[[ "${platform}" == "noaacloud" ]] && conda deactivate
 
 [[ ${FORGIVE_CONDA} == true ]] && set +e +u    # Some platforms have incomplete python3 or conda support, but wouldn't necessarily block workflow tests
 conda activate srw_app
diff --git a/.cicd/scripts/srw_metric.sh b/.cicd/scripts/srw_metric.sh
index 8f6eed85b..54a4fde65 100755
--- a/.cicd/scripts/srw_metric.sh
+++ b/.cicd/scripts/srw_metric.sh
@@ -79,7 +79,7 @@ cd ${workspace}
 # Activate workflow environment
 module load wflow_${platform,,}
 # Deactivate conflicting conda env on GCP
-[[ "${SRW_PLATFORM}" =~ "gclusternoaa" ]] && conda deactivate
+[[ "${platform}" == "noaacloud" ]] && conda deactivate
 
 [[ ${FORGIVE_CONDA} == true ]] && set +e +u    # Some platforms have incomplete python3 or conda support, but would not necessarily block workflow tests
 conda activate srw_app
diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua
index e6e4268c3..a2dd45084 100644
--- a/modulefiles/tasks/noaacloud/python_srw.lua
+++ b/modulefiles/tasks/noaacloud/python_srw.lua
@@ -1,7 +1,2 @@
 load("conda")
 setenv("SRW_ENV", "srw_app")
-
--- Add missing libstdc binary for Azure
-if os.getenv("PW_CSP") == "azure" then
-   setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
-end
diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
index 67b1b98ad..737fc4f7c 100644
--- a/modulefiles/tasks/noaacloud/run_vx.local.lua
+++ b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -25,8 +25,3 @@ end
 load("ufs-pyenv")
 load("conda")
 setenv("SRW_ENV", "srw_app")
-
--- Add missing libstdc binary for Azure
-if os.getenv("PW_CSP") == "azure" then
-   setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
-end