diff --git a/CODEOWNERS b/CODEOWNERS
index e5c86ae0..63f13bbc 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,28 +1,28 @@
 # These owners will be the default owners for everything in
 # the repo, unless a later match takes precedence.
 
-* @kubernetes-simulator/simulator
+* @controlplaneio/simulator
 
 # Scenarios
-/simulation-scripts/scenario @abdullahgarcia @jondkent @jpts @sublimino
+/simulation-scripts/scenario @abdullahgarcia @jondkent @sublimino
 
 # Terraform
-/terraform @jondkent @abdullahgarcia @jpts
+/terraform @jondkent @abdullahgarcia
 
 # Tools
-/tools @abdullahgarcia @jondkent @jpts
+/tools @abdullahgarcia @jondkent
 
 # Attack Container
-/attack @jondkent @abdullahgarcia @jpts @sublimino
+/attack @jondkent @abdullahgarcia @sublimino
 
 # Simulator Binaries
-/cmd @jondkent @abdullahgarcia @jpts
-/pkg @jondkent @abdullahgarcia @jpts
+/cmd @jondkent @abdullahgarcia
+/pkg @jondkent @abdullahgarcia
 
 # kubesim
-/kubesim @jondkent @abdullahgarcia @jpts
+/kubesim @jondkent @abdullahgarcia
 
 # Build Files
-/Dockerfile @jondkent @abdullahgarcia @jpts
-/Jenkinsfile @jondkent @abdullahgarcia @jpts
-/Makefile @jondkent @abdullahgarcia @jpts
+/Dockerfile @jondkent @abdullahgarcia
+/Jenkinsfile @jondkent @abdullahgarcia
+/Makefile @jondkent @abdullahgarcia