diff --git a/.gitmodules b/.gitmodules
index 2f6cb0566..bb494fd4c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "spack"]
   path = spack
-  url = https://github.com/jcsda/spack
-  branch = spack-stack-dev
+  url = https://github.com/AlexanderHrabski-NOAA/spack
+  branch = update-spack-from-develop
 [submodule "repos/builtin"]
   path = repos/builtin
-  url = https://github.com/jcsda/spack-packages
-  branch = spack-stack-dev
+  url = https://github.com/AlexanderHrabski-NOAA/spack-packages
+  branch = update-spack-packages-from-develop
diff --git a/repos/builtin b/repos/builtin
index 6fd08efa4..2c97160a3 160000
--- a/repos/builtin
+++ b/repos/builtin
@@ -1 +1 @@
-Subproject commit 6fd08efa4662fda2b4ef626cdc98c264d2dc05e5
+Subproject commit 2c97160a353851b7ba82cc40394f9f228a304910
diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py
index 2e3911b54..0231146ea 100644
--- a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py
+++ b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py
@@ -31,7 +31,7 @@ class DevUtilsEnv(BundlePackage):
 
     # Scalasca/ScoreP
     depends_on("scalasca", when="+scalasca", type="run")
-    depends_on("cube +gui", when="+scalasca", type="run")
+    depends_on("cube", when="+scalasca", type="run")
   
     # Miscellaneous
     depends_on("cloc", type="run")
diff --git a/spack b/spack
index 324bf79a3..6fb75bd0c 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 324bf79a31704dbc68fafc9e4a053aa4c60019ea
+Subproject commit 6fb75bd0c607b5148c3a126301bc7a9e13b86b26