diff --git a/VERSION b/VERSION
index e25d8d9..0664a8f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.5
+1.1.6
diff --git a/modulefiles/fit2obs_noaacloud.lua b/modulefiles/fit2obs_noaacloud.lua
new file mode 100644
index 0000000..4c025f8
--- /dev/null
+++ b/modulefiles/fit2obs_noaacloud.lua
@@ -0,0 +1,16 @@
+help([[
+Build environment for fit2obs on NOAA cloud
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
+
+load("gnu")
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+load("fit2obs_common")
+
+whatis("Description: fit2obs environment on NOAA cloud")
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index e06c0a3..eefcf43 100755
--- a/ush/detect_machine.sh
+++ b/ush/detect_machine.sh
@@ -32,8 +32,17 @@ case $(hostname -f) in
   login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2
 
   discover3[1-5].prv.cube) MACHINE_ID=discover ;; ### discover31-35
+
+  *) MACHINE_ID=UNKNOWN ;; ### unknown platform
 esac
 
+if [[ ${MACHINE_ID} == "UNKNOWN" ]]; then
+	case ${PW_CSP:-} in
+		"aws" | "google" | "azure") MACHINE_ID=noaacloud ;; ## NOAA cloud platform
+		*) PW_CSP="UNKNOWN"
+	esac
+fi
+
 # Overwrite auto-detect with MACHINE if set
 MACHINE_ID=${MACHINE:-${MACHINE_ID}}
 
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 7600970..e4e4060 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -85,6 +85,10 @@ elif [[ $MACHINE_ID = discover* ]]; then
     export PATH=$PATH:$SPACK_ROOT/bin
     . $SPACK_ROOT/share/spack/setup-env.sh
 
+elif [[ $MACHINE_ID == "noaacloud" ]]; then
+    # We are on NOAA cloud
+    module purge
+
 else
     echo WARNING: UNKNOWN PLATFORM 1>&2
 fi