diff --git a/.gitmodules b/.gitmodules
index e25ff67d834b14e44ed0b1145d604e939fc1c089..2c828d280f90995e47f269c709a10f4e6490f383 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,11 +18,11 @@
 [submodule "robotic-controller/src/ccf"]
 	path = robotic-controller/src/ccf
 	url = ../ccf/ccf.git
-	branch = noetic/feature/collab
+	branch = noetic/feature/tags
 [submodule "robotic-controller/src/ccf_immersive_sorting"]
 	path = robotic-controller/src/ccf_immersive_sorting
 	url = ../ccf/ccf_immersive_sorting.git
-	branch = noetic/feature/collab
+	branch = noetic/feature/tags
 [submodule "robotic-controller/src/panda_util"]
 	path = robotic-controller/src/panda_util
 	url = ../packages/panda_util.git
diff --git a/robotic-controller/src/ccf b/robotic-controller/src/ccf
index 1c2eb54adfcfa80dce643596859d2478aa4a5123..d79d1c40b974d0d5a88104913f679bcb980ad973 160000
--- a/robotic-controller/src/ccf
+++ b/robotic-controller/src/ccf
@@ -1 +1 @@
-Subproject commit 1c2eb54adfcfa80dce643596859d2478aa4a5123
+Subproject commit d79d1c40b974d0d5a88104913f679bcb980ad973
diff --git a/robotic-controller/src/ccf_immersive_sorting b/robotic-controller/src/ccf_immersive_sorting
index 6c2a90b30d4c17219447aa18291b8c07d6f433ca..3464e27642725c6c143a2850399f42563c35b42a 160000
--- a/robotic-controller/src/ccf_immersive_sorting
+++ b/robotic-controller/src/ccf_immersive_sorting
@@ -1 +1 @@
-Subproject commit 6c2a90b30d4c17219447aa18291b8c07d6f433ca
+Subproject commit 3464e27642725c6c143a2850399f42563c35b42a