diff --git a/deploy/bootstrap.py b/deploy/bootstrap.py
index a223bb1ed..dd4300c95 100755
--- a/deploy/bootstrap.py
+++ b/deploy/bootstrap.py
@@ -355,8 +355,11 @@ def get_env_vars(machine, compiler, mpilib):
     if machine is None:
         machine = 'None'
 
-    # convert env vars from mache to a list
-    env_vars = 'export MPAS_EXTERNAL_LIBS=""\n'
+    env_vars = f'export POLARIS_COMPILER={compiler}\n' \
+               f'export POLARIS_MPI={mpilib}\n'
+
+    env_vars = f'{env_vars}' \
+               f'export MPAS_EXTERNAL_LIBS=""\n'
 
     if 'intel' in compiler and machine == 'anvil':
         env_vars = f'{env_vars}' \
diff --git a/e3sm_submodules/Omega b/e3sm_submodules/Omega
index 0a642b74e..3f7369496 160000
--- a/e3sm_submodules/Omega
+++ b/e3sm_submodules/Omega
@@ -1 +1 @@
-Subproject commit 0a642b74e230da58bc3abe9412f9aa3b8832dab6
+Subproject commit 3f7369496150cca1162365cfac0eebbd55a41cd9