diff --git a/OWNERS b/OWNERS
index eef1a918f..3d9f89b5a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
-henrika@google.com
-niklase@google.com
-ajm@google.com
-tlegrand@google.com
\ No newline at end of file
+henrika@webrtc.org
+niklas.enbom@webrtc.org
+andrew@webrtc.org
+tina.legrand@webrtc.org
\ No newline at end of file
diff --git a/peerconnection/OWNERS b/peerconnection/OWNERS
index 02d865517..0fba12573 100644
--- a/peerconnection/OWNERS
+++ b/peerconnection/OWNERS
@@ -1 +1 @@
-tommi@google.com
+tommi@webrtc.org
diff --git a/src/common_audio/OWNERS b/src/common_audio/OWNERS
index 0eb967b2f..d324cc417 100644
--- a/src/common_audio/OWNERS
+++ b/src/common_audio/OWNERS
@@ -1 +1 @@
-bjornv@google.com
+bjornv@webrtc.org
diff --git a/src/common_audio/resampler/OWNERS b/src/common_audio/resampler/OWNERS
index cf595df7d..97d0283eb 100644
--- a/src/common_audio/resampler/OWNERS
+++ b/src/common_audio/resampler/OWNERS
@@ -1,3 +1,3 @@
-bjornv@google.com
-tlegrand@google.com
-jks@google.com
+bjornv@webrtc.org
+tina.legrand@webrtc.org
+jan.skoglund@webrtc.org
diff --git a/src/common_audio/signal_processing_library/OWNERS b/src/common_audio/signal_processing_library/OWNERS
index cf595df7d..97d0283eb 100644
--- a/src/common_audio/signal_processing_library/OWNERS
+++ b/src/common_audio/signal_processing_library/OWNERS
@@ -1,3 +1,3 @@
-bjornv@google.com
-tlegrand@google.com
-jks@google.com
+bjornv@webrtc.org
+tina.legrand@webrtc.org
+jan.skoglund@webrtc.org
diff --git a/src/common_audio/vad/OWNERS b/src/common_audio/vad/OWNERS
index 913285113..d0e98707f 100644
--- a/src/common_audio/vad/OWNERS
+++ b/src/common_audio/vad/OWNERS
@@ -1,2 +1,2 @@
-bjornv@google.com
-jks@google.com
+bjornv@webrtc.org
+jan.skoglund@webrtc.org
diff --git a/src/common_video/OWNERS b/src/common_video/OWNERS
index 30eee35f1..7183cf213 100644
--- a/src/common_video/OWNERS
+++ b/src/common_video/OWNERS
@@ -1,4 +1,4 @@
-holmer@google.com
-mikhal@google.com
-marpan@google.com
-hlundin@google.com
+stefan@webrtc.org
+mikhal@webrtc.org
+marpan@webrtc.org
+henrik.lundin@webrtc.org
diff --git a/src/modules/audio_coding/NetEQ/OWNERS b/src/modules/audio_coding/NetEQ/OWNERS
index 603aa40b6..1d2554224 100644
--- a/src/modules/audio_coding/NetEQ/OWNERS
+++ b/src/modules/audio_coding/NetEQ/OWNERS
@@ -1,2 +1,2 @@
-hlundin@google.com
-tlegrand@google.com
+henrik.lundin@webrtc.org
+tina.legrand@webrtc.org
diff --git a/src/modules/audio_coding/codecs/OWNERS b/src/modules/audio_coding/codecs/OWNERS
index a7220e7ea..e1e6256ca 100644
--- a/src/modules/audio_coding/codecs/OWNERS
+++ b/src/modules/audio_coding/codecs/OWNERS
@@ -1,3 +1,3 @@
-tlegrand@google.com
-turajs@google.com
-jks@google.com
+tina.legrand@webrtc.org
+turaj@webrtc.org
+jan.skoglund@webrtc.org
diff --git a/src/modules/audio_coding/main/OWNERS b/src/modules/audio_coding/main/OWNERS
index a7220e7ea..e1e6256ca 100644
--- a/src/modules/audio_coding/main/OWNERS
+++ b/src/modules/audio_coding/main/OWNERS
@@ -1,3 +1,3 @@
-tlegrand@google.com
-turajs@google.com
-jks@google.com
+tina.legrand@webrtc.org
+turaj@webrtc.org
+jan.skoglund@webrtc.org
diff --git a/src/modules/audio_conference_mixer/OWNERS b/src/modules/audio_conference_mixer/OWNERS
index 0df1f3e59..7dc791ef9 100644
--- a/src/modules/audio_conference_mixer/OWNERS
+++ b/src/modules/audio_conference_mixer/OWNERS
@@ -1,3 +1,3 @@
-hellner@google.com
-pwestin@google.com
-ajm@google.com
\ No newline at end of file
+henrike@webrtc.org
+pwestin@webrtc.org
+andrew@webrtc.org
\ No newline at end of file
diff --git a/src/modules/audio_device/OWNERS b/src/modules/audio_device/OWNERS
index 1d503d299..a07ced37b 100644
--- a/src/modules/audio_device/OWNERS
+++ b/src/modules/audio_device/OWNERS
@@ -1,4 +1,4 @@
-grunell@google.com
-henrika@google.com
-niklase@google.com
-xians@google.com
+henrikg@webrtc.org
+henrika@webrtc.org
+niklas.enbom@webrtc.org
+xians@webrtc.org
diff --git a/src/modules/audio_processing/OWNERS b/src/modules/audio_processing/OWNERS
index aecf56ed3..5a2563444 100644
--- a/src/modules/audio_processing/OWNERS
+++ b/src/modules/audio_processing/OWNERS
@@ -1,2 +1,2 @@
-ajm@google.com
-bjornv@google.com
+andrew@webrtc.org
+bjornv@webrtc.org
diff --git a/src/modules/media_file/OWNERS b/src/modules/media_file/OWNERS
index 8d73cd9d2..54069c445 100644
--- a/src/modules/media_file/OWNERS
+++ b/src/modules/media_file/OWNERS
@@ -1,4 +1,4 @@
-hellner@google.com
-pwestin@google.com
-perkj@google.com
-niklase@google.com
\ No newline at end of file
+henrike@webrtc.org
+pwestin@webrtc.org
+perkj@webrtc.org
+niklas.enbom@webrtc.org
\ No newline at end of file
diff --git a/src/modules/rtp_rtcp/OWNERS b/src/modules/rtp_rtcp/OWNERS
index a308006d5..76df5b4d7 100644
--- a/src/modules/rtp_rtcp/OWNERS
+++ b/src/modules/rtp_rtcp/OWNERS
@@ -1,6 +1,6 @@
-hellner@google.com
-pwestin@google.com
-holmer@google.com
-hlundin@google.com
-mflodman@google.com
-asapersson@google.com
\ No newline at end of file
+henrike@webrtc.org
+pwestin@webrtc.org
+stefan@webrtc.org
+henrik.lundin@webrtc.org
+mflodman@webrtc.org
+asapersson@webrtc.org
\ No newline at end of file
diff --git a/src/modules/udp_transport/OWNERS b/src/modules/udp_transport/OWNERS
index ded5e8bd3..5a5722834 100644
--- a/src/modules/udp_transport/OWNERS
+++ b/src/modules/udp_transport/OWNERS
@@ -1,5 +1,5 @@
-hellner@google.com
-pwestin@google.com
-grunell@google.com
-mallinath@google.com
-tomasl@google.com
\ No newline at end of file
+henrike@webrtc.org
+pwestin@webrtc.org
+henrikg@webrtc.org
+mallinath@webrtc.org
+tomasl@webrtc.org
\ No newline at end of file
diff --git a/src/modules/utility/OWNERS b/src/modules/utility/OWNERS
index 6ca0dffd4..674c73801 100644
--- a/src/modules/utility/OWNERS
+++ b/src/modules/utility/OWNERS
@@ -1,4 +1,4 @@
-hellner@google.com
-pwestin@google.com
-asapersson@google.com
-perkj@google.com
\ No newline at end of file
+henrike@webrtc.org
+pwestin@webrtc.org
+asapersson@webrtc.org
+perkj@webrtc.org
\ No newline at end of file
diff --git a/src/modules/video_capture/OWNERS b/src/modules/video_capture/OWNERS
index 568363eab..e5affd49d 100644
--- a/src/modules/video_capture/OWNERS
+++ b/src/modules/video_capture/OWNERS
@@ -1,2 +1,2 @@
-mflodman@google.com
-perkj@google.com
+mflodman@webrtc.org
+perkj@webrtc.org
diff --git a/src/modules/video_coding/codecs/OWNERS b/src/modules/video_coding/codecs/OWNERS
index 30eee35f1..7183cf213 100644
--- a/src/modules/video_coding/codecs/OWNERS
+++ b/src/modules/video_coding/codecs/OWNERS
@@ -1,4 +1,4 @@
-holmer@google.com
-mikhal@google.com
-marpan@google.com
-hlundin@google.com
+stefan@webrtc.org
+mikhal@webrtc.org
+marpan@webrtc.org
+henrik.lundin@webrtc.org
diff --git a/src/modules/video_coding/main/OWNERS b/src/modules/video_coding/main/OWNERS
index 30eee35f1..7183cf213 100644
--- a/src/modules/video_coding/main/OWNERS
+++ b/src/modules/video_coding/main/OWNERS
@@ -1,4 +1,4 @@
-holmer@google.com
-mikhal@google.com
-marpan@google.com
-hlundin@google.com
+stefan@webrtc.org
+mikhal@webrtc.org
+marpan@webrtc.org
+henrik.lundin@webrtc.org
diff --git a/src/modules/video_processing/main/OWNERS b/src/modules/video_processing/main/OWNERS
index 30eee35f1..7183cf213 100644
--- a/src/modules/video_processing/main/OWNERS
+++ b/src/modules/video_processing/main/OWNERS
@@ -1,4 +1,4 @@
-holmer@google.com
-mikhal@google.com
-marpan@google.com
-hlundin@google.com
+stefan@webrtc.org
+mikhal@webrtc.org
+marpan@webrtc.org
+henrik.lundin@webrtc.org
diff --git a/src/modules/video_render/OWNERS b/src/modules/video_render/OWNERS
index 435723d10..ac607bd1f 100644
--- a/src/modules/video_render/OWNERS
+++ b/src/modules/video_render/OWNERS
@@ -1,4 +1,4 @@
-mflodman@google.com
-perkj@google.com
-ronghuawu@google.com
-mallinath@google.com
+mflodman@webrtc.org
+perkj@webrtc.org
+wu@webrtc.org
+mallinath@webrtc.org
diff --git a/src/system_wrappers/OWNERS b/src/system_wrappers/OWNERS
index 32dcbbc50..4091a93d7 100644
--- a/src/system_wrappers/OWNERS
+++ b/src/system_wrappers/OWNERS
@@ -1,7 +1,7 @@
-hellner@google.com
-pwestin@google.com
-perkj@google.com
-henrika@google.com
-grunell@google.com
-mflodman@google.com
-niklase@google.com
\ No newline at end of file
+henrike@webrtc.org
+pwestin@webrtc.org
+perkj@webrtc.org
+henrika@webrtc.org
+henrikg@webrtc.org
+mflodman@webrtc.org
+niklas.enbom@webrtc.org
\ No newline at end of file
diff --git a/src/video_engine/OWNERS b/src/video_engine/OWNERS
index 435723d10..ac607bd1f 100644
--- a/src/video_engine/OWNERS
+++ b/src/video_engine/OWNERS
@@ -1,4 +1,4 @@
-mflodman@google.com
-perkj@google.com
-ronghuawu@google.com
-mallinath@google.com
+mflodman@webrtc.org
+perkj@webrtc.org
+wu@webrtc.org
+mallinath@webrtc.org
diff --git a/src/voice_engine/OWNERS b/src/voice_engine/OWNERS
index 1d503d299..a07ced37b 100644
--- a/src/voice_engine/OWNERS
+++ b/src/voice_engine/OWNERS
@@ -1,4 +1,4 @@
-grunell@google.com
-henrika@google.com
-niklase@google.com
-xians@google.com
+henrikg@webrtc.org
+henrika@webrtc.org
+niklas.enbom@webrtc.org
+xians@webrtc.org
diff --git a/third_party_mods/libjingle/OWNERS b/third_party_mods/libjingle/OWNERS
index fcbf93148..3fea5d094 100644
--- a/third_party_mods/libjingle/OWNERS
+++ b/third_party_mods/libjingle/OWNERS
@@ -1,5 +1,5 @@
-hellner@google.com
-mallinath@google.com
-perkj@google.com
-ronghuawu@google.com
-tommi@google.com
+henrike@webrtc.org
+mallinath@webrtc.org
+perkj@webrtc.org
+wu@webrtc.org
+tommi@webrtc.org