diff --git a/.gitmodules b/.gitmodules
index 11c1246..cd9aa08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,71 +1,61 @@
 [submodule "gen"]
 	path = gen
-	url = git@github.com:WireCell/wire-cell-gen.git
+	url = https://github.com/WireCell/wire-cell-gen.git
         update = merge
+	branch = 0.6.x
 [submodule "sst"]
 	path = sst
-	url = git@github.com:WireCell/wire-cell-sst.git
+	url = https://github.com/WireCell/wire-cell-sst.git
         update = merge
+	branch = 0.6.x
 [submodule "iface"]
 	path = iface
-	url = git@github.com:WireCell/wire-cell-iface.git
+	url = https://github.com/WireCell/wire-cell-iface.git
         update = merge
+	branch = 0.6.x
 [submodule "riodata"]
 	path = riodata
-	url = git@github.com:WireCell/wire-cell-riodata.git
-        update = merge
-[submodule "rootdict"]
-	path = rootdict
-	url = git@github.com:WireCell/wire-cell-rootdict.git
+	url = https://github.com/WireCell/wire-cell-riodata.git
         update = merge
 [submodule "util"]
 	path = util
-	url = git@github.com:WireCell/wire-cell-util.git
-        update = merge
-[submodule "dfp"]
-	path = dfp
-	url = git@github.com:WireCell/wire-cell-dfp.git
-        update = merge
-[submodule "alg"]
-	path = alg
-	url = git@github.com:WireCell/wire-cell-alg.git
-        update = merge
-[submodule "rootvis"]
-	path = rootvis
-	url = git@github.com:WireCell/wire-cell-rootvis.git
+	url = https://github.com/WireCell/wire-cell-util.git
         update = merge
+	branch = 0.6.x
 [submodule "bio"]
 	path = bio
-	url = git@github.com:WireCell/wire-cell-bio.git
+	url = https://github.com/WireCell/wire-cell-bio.git
         update = merge
 [submodule "apps"]
 	path = apps
-	url = git@github.com:WireCell/wire-cell-apps.git
+	url = https://github.com/WireCell/wire-cell-apps.git
         update = merge
+	branch = 0.6.x
 [submodule "wire-cell-tbb"]
 	path = wire-cell-tbb
-	url = git@github.com:WireCell/wire-cell-tbb.git
-        update = merge
-[submodule "tbb"]
-	path = tbb
-	url = git@github.com:WireCell/wire-cell-tbb.git
+	url = https://github.com/WireCell/wire-cell-tbb.git
         update = merge
 [submodule "python"]
 	path = python
-	url = git@github.com:WireCell/wire-cell-python.git
+	url = https://github.com/WireCell/wire-cell-python.git
         update = merge
+	branch = 0.6.x
 [submodule "cfg"]
 	path = cfg
-	url = git@github.com:WireCell/wire-cell-cfg.git
+	url = https://github.com/WireCell/wire-cell-cfg.git
         update = merge
+	branch = 0.6.x
 [submodule "sigproc"]
 	path = sigproc
-	url = git@github.com:WireCell/wire-cell-sigproc.git
+	url = https://github.com/WireCell/wire-cell-sigproc.git
         update = merge
+	branch = 0.6.x
 [submodule "waftools"]
 	path = waftools
-	url = git@github.com:WireCell/waf-tools.git
+	url = https://github.com/WireCell/waf-tools.git
         update = merge
+	branch = 0.6.x
 [submodule "sio"]
 	path = sio
-	url = git@github.com:WireCell/wire-cell-sio.git
+	url = https://github.com/WireCell/wire-cell-sio.git
+	branch = 0.6.x
diff --git a/alg b/alg
deleted file mode 160000
index 878b262..0000000
--- a/alg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 878b26202acbac233e304b134915880b7b7a32ed
diff --git a/dfp b/dfp
deleted file mode 160000
index 888d72a..0000000
--- a/dfp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 888d72a0f3938028d6e140373b0a06c253f1173b
diff --git a/rootdict b/rootdict
deleted file mode 160000
index b1b7acc..0000000
--- a/rootdict
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b1b7accaeb7b6eac4598c6e2bdc2de9c5c0387e1
diff --git a/rootvis b/rootvis
deleted file mode 160000
index 89be5c2..0000000
--- a/rootvis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89be5c26f1c3bd6ee60bec881eede7a3a082509d
diff --git a/tbb b/tbb
deleted file mode 160000
index 9d01d33..0000000
--- a/tbb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d01d333ade8c1d430453c6e00cf3bc73f4afd49
diff --git a/waftools b/waftools
index 43bcfb4..96429ca 160000
--- a/waftools
+++ b/waftools
@@ -1 +1 @@
-Subproject commit 43bcfb4498703539180de251639b7e23aee8cef3
+Subproject commit 96429cae4a846bc42ab3c8dd3afdcfc033275439