diff --git a/.gitmodules b/.gitmodules
index 1dee0cec2d..54aa159e83 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,12 +10,9 @@
 [submodule "external/hipify_torch"]
 	path = external/hipify_torch
 	url = https://github.com/ROCmSoftwarePlatform/hipify_torch.git
-# TODO Using a private copy of cutlass is a temporary mitigation to enable grouped gemm.
-# Go back to main cutlass when possible.
 [submodule "external/cutlass"]
 	path = external/cutlass
-	url = https://github.com/jwfromm/cutlass
-	branch = FBGEMM
+	url = https://github.com/NVIDIA/cutlass.git
 [submodule "external/composable_kernel"]
 	path = external/composable_kernel
 	url = https://github.com/ROCm/composable_kernel.git
diff --git a/external/cutlass b/external/cutlass
index 311f3c8e51..f3fde58372 160000
--- a/external/cutlass
+++ b/external/cutlass
@@ -1 +1 @@
-Subproject commit 311f3c8e51dc0eb56310cfc6980bf63d0fbd7917
+Subproject commit f3fde58372d33e9a5650ba7b80fc48b3b49d40c8