diff --git a/src/sonic-yang-models/yang-models/sonic-auto_techsupport.yang b/src/sonic-yang-models/yang-models/sonic-auto_techsupport.yang
index 02e29463d594..078609c0e1f7 100644
--- a/src/sonic-yang-models/yang-models/sonic-auto_techsupport.yang
+++ b/src/sonic-yang-models/yang-models/sonic-auto_techsupport.yang
@@ -2,7 +2,7 @@ module sonic-auto_techsupport {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-auto_techsupport";
+    namespace "http://github.com/sonic-net/sonic-auto_techsupport";
     prefix auto_techsupport;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-allowed-prefix.yang b/src/sonic-yang-models/yang-models/sonic-bgp-allowed-prefix.yang
index 942387983775..65f5dab74733 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-allowed-prefix.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-allowed-prefix.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-allowed-prefix {
-    namespace "http://github.com/Azure/sonic-bgp-allowed-prefix";
+    namespace "http://github.com/sonic-net/sonic-bgp-allowed-prefix";
     prefix bgppre;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-common.yang b/src/sonic-yang-models/yang-models/sonic-bgp-common.yang
index 1c360faa9cd4..5d9f71026327 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-common.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-common.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-common {
-    namespace "http://github.com/Azure/sonic-bgp-common";
+    namespace "http://github.com/sonic-net/sonic-bgp-common";
     prefix bgpcmn;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-device-global.yang b/src/sonic-yang-models/yang-models/sonic-bgp-device-global.yang
index 728714c7d51f..277be6870922 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-device-global.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-device-global.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-device-global {
-    namespace "http://github.com/Azure/sonic-bgp-device-global";
+    namespace "http://github.com/sonic-net/sonic-bgp-device-global";
     prefix bgp_device_global;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-global.yang b/src/sonic-yang-models/yang-models/sonic-bgp-global.yang
index a428635e6037..db6c02356aa6 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-global.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-global.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-global {
-    namespace "http://github.com/Azure/sonic-bgp-global";
+    namespace "http://github.com/sonic-net/sonic-bgp-global";
     prefix bgpg;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang
index 69a089f7cab8..a58f404cb693 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-internal-neighbor {
-    namespace "http://github.com/Azure/sonic-bgp-internal-neighbor";
+    namespace "http://github.com/sonic-net/sonic-bgp-internal-neighbor";
     prefix bgpintnbr;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-monitor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-monitor.yang
index d152ea94166b..537a919b6f94 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-monitor.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-monitor.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-monitor {
-    namespace "http://github.com/Azure/sonic-bgp-monitor";
+    namespace "http://github.com/sonic-net/sonic-bgp-monitor";
     prefix bgpmon;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang
index 12432ffc35bb..3ae4d89d52d3 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-neighbor {
-    namespace "http://github.com/Azure/sonic-bgp-neighbor";
+    namespace "http://github.com/sonic-net/sonic-bgp-neighbor";
     prefix bgpnbr;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-peergroup.yang b/src/sonic-yang-models/yang-models/sonic-bgp-peergroup.yang
index 0cc9d5cb3f6a..a1f9bd2ce9e2 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-peergroup.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-peergroup.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-peergroup {
-    namespace "http://github.com/Azure/sonic-bgp-peergroup";
+    namespace "http://github.com/sonic-net/sonic-bgp-peergroup";
     prefix pg;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-peerrange.yang b/src/sonic-yang-models/yang-models/sonic-bgp-peerrange.yang
index 88d39d82d68c..01348096ccab 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-peerrange.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-peerrange.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-peerrange {
-    namespace "http://github.com/Azure/sonic-bgp-peerrange";
+    namespace "http://github.com/sonic-net/sonic-bgp-peerrange";
     prefix pr;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang
index 662f77c3c899..ad4d227ee0a8 100644
--- a/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang
@@ -1,5 +1,5 @@
 module sonic-bgp-voq-chassis-neighbor {
-    namespace "http://github.com/Azure/sonic-bgp-voq-chassis-neighbor";
+    namespace "http://github.com/sonic-net/sonic-bgp-voq-chassis-neighbor";
     prefix bgpintnbr;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang b/src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang
index 85c0cf997d40..7d77669c19df 100644
--- a/src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang
+++ b/src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang
@@ -2,7 +2,7 @@ module sonic-breakout_cfg {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-breakout_cfg";
+    namespace "http://github.com/sonic-net/sonic-breakout_cfg";
     prefix breakout_cfg;
 
     import sonic-extension {
diff --git a/src/sonic-yang-models/yang-models/sonic-buffer-pg.yang b/src/sonic-yang-models/yang-models/sonic-buffer-pg.yang
index 60d06bf6ef6c..2886174faeda 100644
--- a/src/sonic-yang-models/yang-models/sonic-buffer-pg.yang
+++ b/src/sonic-yang-models/yang-models/sonic-buffer-pg.yang
@@ -1,5 +1,5 @@
 module sonic-buffer-pg {
-    namespace "http://github.com/Azure/sonic-buffer-pg";
+    namespace "http://github.com/sonic-net/sonic-buffer-pg";
     prefix bpg;
 
     yang-version 1.1;
diff --git a/src/sonic-yang-models/yang-models/sonic-buffer-pool.yang b/src/sonic-yang-models/yang-models/sonic-buffer-pool.yang
index c59d4ec66ab5..fd83218573b5 100644
--- a/src/sonic-yang-models/yang-models/sonic-buffer-pool.yang
+++ b/src/sonic-yang-models/yang-models/sonic-buffer-pool.yang
@@ -1,5 +1,5 @@
 module sonic-buffer-pool {
-    namespace "http://github.com/Azure/sonic-buffer-pool";
+    namespace "http://github.com/sonic-net/sonic-buffer-pool";
     prefix bpl;
 
     organization
diff --git a/src/sonic-yang-models/yang-models/sonic-buffer-port-egress-profile-list.yang b/src/sonic-yang-models/yang-models/sonic-buffer-port-egress-profile-list.yang
index 10af27b77458..6c1a75fbfd30 100644
--- a/src/sonic-yang-models/yang-models/sonic-buffer-port-egress-profile-list.yang
+++ b/src/sonic-yang-models/yang-models/sonic-buffer-port-egress-profile-list.yang
@@ -1,5 +1,5 @@
 module sonic-buffer-port-egress-profile-list {
-    namespace "http://github.com/Azure/sonic-buffer-port-egress-profile-list";
+    namespace "http://github.com/sonic-net/sonic-buffer-port-egress-profile-list";
     prefix bpg;
 
     import sonic-extension {
diff --git a/src/sonic-yang-models/yang-models/sonic-buffer-port-ingress-profile-list.yang b/src/sonic-yang-models/yang-models/sonic-buffer-port-ingress-profile-list.yang
index 603f50bf2ec2..01a7f6bb6e21 100644
--- a/src/sonic-yang-models/yang-models/sonic-buffer-port-ingress-profile-list.yang
+++ b/src/sonic-yang-models/yang-models/sonic-buffer-port-ingress-profile-list.yang
@@ -1,5 +1,5 @@
 module sonic-buffer-port-ingress-profile-list {
-    namespace "http://github.com/Azure/sonic-buffer-port-ingress-profile-list";
+    namespace "http://github.com/sonic-net/sonic-buffer-port-ingress-profile-list";
     prefix bpg;
 
     import sonic-extension {
diff --git a/src/sonic-yang-models/yang-models/sonic-buffer-profile.yang b/src/sonic-yang-models/yang-models/sonic-buffer-profile.yang
index 204e8aa796be..418302e9fc68 100644
--- a/src/sonic-yang-models/yang-models/sonic-buffer-profile.yang
+++ b/src/sonic-yang-models/yang-models/sonic-buffer-profile.yang
@@ -1,5 +1,5 @@
 module sonic-buffer-profile {
-    namespace "http://github.com/Azure/sonic-buffer-profile";
+    namespace "http://github.com/sonic-net/sonic-buffer-profile";
     prefix bpf;
 
     import sonic-buffer-pool {
diff --git a/src/sonic-yang-models/yang-models/sonic-buffer-queue.yang b/src/sonic-yang-models/yang-models/sonic-buffer-queue.yang
index f8c951aa4dd1..bd1130fcc4e2 100644
--- a/src/sonic-yang-models/yang-models/sonic-buffer-queue.yang
+++ b/src/sonic-yang-models/yang-models/sonic-buffer-queue.yang
@@ -1,5 +1,5 @@
 module sonic-buffer-queue {
-    namespace "http://github.com/Azure/sonic-buffer-queue";
+    namespace "http://github.com/sonic-net/sonic-buffer-queue";
     prefix bqueue;
 
     import sonic-extension {
diff --git a/src/sonic-yang-models/yang-models/sonic-cable-length.yang b/src/sonic-yang-models/yang-models/sonic-cable-length.yang
index 2af765f17d10..84ca01f34a00 100644
--- a/src/sonic-yang-models/yang-models/sonic-cable-length.yang
+++ b/src/sonic-yang-models/yang-models/sonic-cable-length.yang
@@ -2,7 +2,7 @@ module sonic-cable-length {
 
     yang-version 1.1;
 
-    namespace  "http://github.com/Azure/sonic-cable-length";
+    namespace  "http://github.com/sonic-net/sonic-cable-length";
 
     prefix cable-length;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-console.yang b/src/sonic-yang-models/yang-models/sonic-console.yang
index ed0af5390f49..65a8e0dc5b43 100644
--- a/src/sonic-yang-models/yang-models/sonic-console.yang
+++ b/src/sonic-yang-models/yang-models/sonic-console.yang
@@ -1,6 +1,6 @@
 module sonic-console {
     yang-version 1.1;
-    namespace "http://github.com/Azure/sonic-console";
+    namespace "http://github.com/sonic-net/sonic-console";
     prefix console;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-copp.yang b/src/sonic-yang-models/yang-models/sonic-copp.yang
index d735150a5c40..0c282472548b 100644
--- a/src/sonic-yang-models/yang-models/sonic-copp.yang
+++ b/src/sonic-yang-models/yang-models/sonic-copp.yang
@@ -2,7 +2,7 @@ module sonic-copp {
 
 	yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-copp";
+	namespace "http://github.com/sonic-net/sonic-copp";
 	prefix copp;
 
 	import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-crm.yang b/src/sonic-yang-models/yang-models/sonic-crm.yang
index f554358645f6..87b36276d663 100644
--- a/src/sonic-yang-models/yang-models/sonic-crm.yang
+++ b/src/sonic-yang-models/yang-models/sonic-crm.yang
@@ -2,7 +2,7 @@ module sonic-crm {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-crm";
+    namespace "http://github.com/sonic-net/sonic-crm";
     prefix crm;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-default-lossless-buffer-parameter.yang b/src/sonic-yang-models/yang-models/sonic-default-lossless-buffer-parameter.yang
index 6f98d9a922b7..4fccf943fc3a 100644
--- a/src/sonic-yang-models/yang-models/sonic-default-lossless-buffer-parameter.yang
+++ b/src/sonic-yang-models/yang-models/sonic-default-lossless-buffer-parameter.yang
@@ -2,7 +2,7 @@ module sonic-default-lossless-buffer-parameter {
 
     yang-version 1.1;
 
-    namespace  "http://github.com/Azure/sonic-default-lossless-buffer-parameter";
+    namespace  "http://github.com/sonic-net/sonic-default-lossless-buffer-parameter";
 
     prefix default-lossless-buffer-parameter;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
index 1d40dc31b798..d7b92bea82fd 100644
--- a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
+++ b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
@@ -2,7 +2,7 @@ module sonic-device_metadata {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-device_metadata";
+    namespace "http://github.com/sonic-net/sonic-device_metadata";
     prefix device_metadata;
 
     import ietf-yang-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-device_neighbor.yang b/src/sonic-yang-models/yang-models/sonic-device_neighbor.yang
index a7284ccec50c..efca22dafe6c 100644
--- a/src/sonic-yang-models/yang-models/sonic-device_neighbor.yang
+++ b/src/sonic-yang-models/yang-models/sonic-device_neighbor.yang
@@ -2,7 +2,7 @@ module sonic-device_neighbor {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-device_neighbor";
+    namespace "http://github.com/sonic-net/sonic-device_neighbor";
     prefix device_neighbor;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang
index 76526f801c92..6f1aa6b84d71 100644
--- a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang
+++ b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang
@@ -2,7 +2,7 @@ module sonic-device_neighbor_metadata {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-device_neighbor_metadata";
+    namespace "http://github.com/sonic-net/sonic-device_neighbor_metadata";
     prefix device_neighbor_metadata;
 
     import ietf-yang-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-dhcp-server.yang b/src/sonic-yang-models/yang-models/sonic-dhcp-server.yang
index 8dc88c541423..0ca5e8636c91 100644
--- a/src/sonic-yang-models/yang-models/sonic-dhcp-server.yang
+++ b/src/sonic-yang-models/yang-models/sonic-dhcp-server.yang
@@ -2,7 +2,7 @@ module sonic-dhcp-server {
 
     yang-version 1.1;
 
-    namespace  "http://github.com/Azure/sonic-dhcp-server";
+    namespace  "http://github.com/sonic-net/sonic-dhcp-server";
 
     prefix dhcp-server;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-dhcpv6-relay.yang b/src/sonic-yang-models/yang-models/sonic-dhcpv6-relay.yang
index f1e73397dff4..80794114e647 100644
--- a/src/sonic-yang-models/yang-models/sonic-dhcpv6-relay.yang
+++ b/src/sonic-yang-models/yang-models/sonic-dhcpv6-relay.yang
@@ -1,6 +1,6 @@
 module sonic-dhcpv6-relay {
 
-	namespace "http://github.com/Azure/sonic-dhcpv6-relay";
+	namespace "http://github.com/sonic-net/sonic-dhcpv6-relay";
 
 	prefix sdhcpv6relay;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-dot1p-tc-map.yang b/src/sonic-yang-models/yang-models/sonic-dot1p-tc-map.yang
index 1636f43f6c64..12564956b11b 100644
--- a/src/sonic-yang-models/yang-models/sonic-dot1p-tc-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-dot1p-tc-map.yang
@@ -2,7 +2,7 @@ module sonic-dot1p-tc-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-dot1p-tc-map";
+    namespace "http://github.com/sonic-net/sonic-dot1p-tc-map";
 
     prefix dot1ptm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-dscp-fc-map.yang b/src/sonic-yang-models/yang-models/sonic-dscp-fc-map.yang
index 0b489a57bd0a..369064ea5885 100644
--- a/src/sonic-yang-models/yang-models/sonic-dscp-fc-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-dscp-fc-map.yang
@@ -2,7 +2,7 @@ module sonic-dscp-fc-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-dscp-fc-map";
+    namespace "http://github.com/sonic-net/sonic-dscp-fc-map";
 
     prefix dtm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-dscp-tc-map.yang b/src/sonic-yang-models/yang-models/sonic-dscp-tc-map.yang
index fb590b85c6ff..8bfc02fdf5fa 100644
--- a/src/sonic-yang-models/yang-models/sonic-dscp-tc-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-dscp-tc-map.yang
@@ -2,7 +2,7 @@ module sonic-dscp-tc-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-dscp-tc-map";
+    namespace "http://github.com/sonic-net/sonic-dscp-tc-map";
 
     prefix dtm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-exp-fc-map.yang b/src/sonic-yang-models/yang-models/sonic-exp-fc-map.yang
index 79f492bff4f8..43f182c03bdc 100644
--- a/src/sonic-yang-models/yang-models/sonic-exp-fc-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-exp-fc-map.yang
@@ -2,7 +2,7 @@ module sonic-exp-fc-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-exp-fc-map";
+    namespace "http://github.com/sonic-net/sonic-exp-fc-map";
 
     prefix dtm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-feature.yang b/src/sonic-yang-models/yang-models/sonic-feature.yang
index f27411788e8d..797affc7ca3a 100644
--- a/src/sonic-yang-models/yang-models/sonic-feature.yang
+++ b/src/sonic-yang-models/yang-models/sonic-feature.yang
@@ -2,7 +2,7 @@ module sonic-feature{
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-feature";
+    namespace "http://github.com/sonic-net/sonic-feature";
     prefix feature;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
index 9ced223e94bc..e94aa76ccf42 100644
--- a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
+++ b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
@@ -2,7 +2,7 @@ module sonic-flex_counter {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-flex_counter";
+    namespace "http://github.com/sonic-net/sonic-flex_counter";
     prefix flex_counter;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-interface.yang b/src/sonic-yang-models/yang-models/sonic-interface.yang
index 74f241fed0d4..afd46a655501 100644
--- a/src/sonic-yang-models/yang-models/sonic-interface.yang
+++ b/src/sonic-yang-models/yang-models/sonic-interface.yang
@@ -2,7 +2,7 @@ module sonic-interface {
 
 	yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-interface";
+	namespace "http://github.com/sonic-net/sonic-interface";
 	prefix intf;
 
 	import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-kdump.yang b/src/sonic-yang-models/yang-models/sonic-kdump.yang
index c7640ee0c754..364ccdc1a2ca 100644
--- a/src/sonic-yang-models/yang-models/sonic-kdump.yang
+++ b/src/sonic-yang-models/yang-models/sonic-kdump.yang
@@ -1,5 +1,5 @@
 module sonic-kdump {
-    namespace "http://github.com/Azure/sonic-kdump";
+    namespace "http://github.com/sonic-net/sonic-kdump";
     prefix kdump;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-kubernetes_master.yang b/src/sonic-yang-models/yang-models/sonic-kubernetes_master.yang
index 6ac153c606d0..331270122ef9 100644
--- a/src/sonic-yang-models/yang-models/sonic-kubernetes_master.yang
+++ b/src/sonic-yang-models/yang-models/sonic-kubernetes_master.yang
@@ -2,7 +2,8 @@ module sonic-kubernetes_master {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-kubernetes_master";
+    namespace "http://github.com/sonic-net/sonic-kubernetes_master";
+
     prefix kubernetes_master;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-lldp.yang b/src/sonic-yang-models/yang-models/sonic-lldp.yang
index a3620f30fe67..e83d73bbc912 100644
--- a/src/sonic-yang-models/yang-models/sonic-lldp.yang
+++ b/src/sonic-yang-models/yang-models/sonic-lldp.yang
@@ -1,5 +1,5 @@
 module sonic-lldp {
-    namespace "http://github.com/Azure/sonic-lldp";
+    namespace "http://github.com/sonic-net/sonic-lldp";
     prefix slldp;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-loopback-interface.yang b/src/sonic-yang-models/yang-models/sonic-loopback-interface.yang
index c3ada71aaeae..5d64b61c59c5 100644
--- a/src/sonic-yang-models/yang-models/sonic-loopback-interface.yang
+++ b/src/sonic-yang-models/yang-models/sonic-loopback-interface.yang
@@ -2,7 +2,7 @@ module sonic-loopback-interface {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-loopback-interface";
+    namespace "http://github.com/sonic-net/sonic-loopback-interface";
     prefix lointf;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-lossless-traffic-pattern.yang b/src/sonic-yang-models/yang-models/sonic-lossless-traffic-pattern.yang
index 6901dc01e007..5ac4d9243b04 100644
--- a/src/sonic-yang-models/yang-models/sonic-lossless-traffic-pattern.yang
+++ b/src/sonic-yang-models/yang-models/sonic-lossless-traffic-pattern.yang
@@ -2,7 +2,7 @@ module sonic-lossless-traffic-pattern {
 
     yang-version 1.1;
 
-    namespace  "http://github.com/Azure/sonic-lossless-traffic-pattern";
+    namespace  "http://github.com/sonic-net/sonic-lossless-traffic-pattern";
 
     prefix lossless-traffic-pattern;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-macsec.yang b/src/sonic-yang-models/yang-models/sonic-macsec.yang
index 4e3412f86a3d..f9085891900e 100644
--- a/src/sonic-yang-models/yang-models/sonic-macsec.yang
+++ b/src/sonic-yang-models/yang-models/sonic-macsec.yang
@@ -2,7 +2,7 @@ module sonic-macsec {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-macsec";
+    namespace "http://github.com/sonic-net/sonic-macsec";
 
     prefix macsec;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-mclag.yang b/src/sonic-yang-models/yang-models/sonic-mclag.yang
index 39e4c0b2b46f..59799baf4e4d 100644
--- a/src/sonic-yang-models/yang-models/sonic-mclag.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mclag.yang
@@ -1,5 +1,5 @@
 module sonic-mclag {
-    namespace "http://github.com/Azure/sonic-mclag";
+    namespace "http://github.com/sonic-net/sonic-mclag";
     prefix smclag;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-mgmt_interface.yang b/src/sonic-yang-models/yang-models/sonic-mgmt_interface.yang
index c834a28d44e2..119e02f478a5 100644
--- a/src/sonic-yang-models/yang-models/sonic-mgmt_interface.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mgmt_interface.yang
@@ -2,7 +2,7 @@ module sonic-mgmt_interface {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-mgmt_interface";
+    namespace "http://github.com/sonic-net/sonic-mgmt_interface";
     prefix mgmtintf;
 
     import sonic-mgmt_port {
diff --git a/src/sonic-yang-models/yang-models/sonic-mgmt_port.yang b/src/sonic-yang-models/yang-models/sonic-mgmt_port.yang
index fc722abf6488..96a2dfaf3fd1 100644
--- a/src/sonic-yang-models/yang-models/sonic-mgmt_port.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mgmt_port.yang
@@ -2,7 +2,7 @@ module sonic-mgmt_port {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-mgmt_port";
+    namespace "http://github.com/sonic-net/sonic-mgmt_port";
     prefix mgmtprt;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-mgmt_vrf.yang b/src/sonic-yang-models/yang-models/sonic-mgmt_vrf.yang
index 35ac15e1fb85..c851d057b87a 100644
--- a/src/sonic-yang-models/yang-models/sonic-mgmt_vrf.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mgmt_vrf.yang
@@ -2,7 +2,7 @@ module sonic-mgmt_vrf {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-mgmt_vrf";
+    namespace "http://github.com/sonic-net/sonic-mgmt_vrf";
     prefix mvrf;
 
     description
diff --git a/src/sonic-yang-models/yang-models/sonic-mirror-session.yang b/src/sonic-yang-models/yang-models/sonic-mirror-session.yang
index 9ea1954d7a37..98e0e9dfac8d 100644
--- a/src/sonic-yang-models/yang-models/sonic-mirror-session.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mirror-session.yang
@@ -2,7 +2,7 @@ module sonic-mirror-session {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-mirror-session";
+    namespace "http://github.com/sonic-net/sonic-mirror-session";
     prefix sms;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-mpls-tc-map.yang b/src/sonic-yang-models/yang-models/sonic-mpls-tc-map.yang
index 064e448d305c..96392222d1d4 100644
--- a/src/sonic-yang-models/yang-models/sonic-mpls-tc-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mpls-tc-map.yang
@@ -2,7 +2,7 @@ module sonic-mpls-tc-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-mpls-tc-map";
+    namespace "http://github.com/sonic-net/sonic-mpls-tc-map";
 
     prefix mpls_tc_map;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-mux-cable.yang b/src/sonic-yang-models/yang-models/sonic-mux-cable.yang
index a66a588c91da..c70002afdd1a 100644
--- a/src/sonic-yang-models/yang-models/sonic-mux-cable.yang
+++ b/src/sonic-yang-models/yang-models/sonic-mux-cable.yang
@@ -1,5 +1,5 @@
 module sonic-mux-cable {
-    namespace "http://github.com/Azure/sonic-mux-cable";
+    namespace "http://github.com/sonic-net/sonic-mux-cable";
     prefix mux_cable;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-nat.yang b/src/sonic-yang-models/yang-models/sonic-nat.yang
index d01a1a9617f4..c1e554012524 100644
--- a/src/sonic-yang-models/yang-models/sonic-nat.yang
+++ b/src/sonic-yang-models/yang-models/sonic-nat.yang
@@ -1,5 +1,5 @@
 module sonic-nat {
-    namespace "http://github.com/Azure/sonic-nat";
+    namespace "http://github.com/sonic-net/sonic-nat";
     prefix snat;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-ntp.yang b/src/sonic-yang-models/yang-models/sonic-ntp.yang
index bea02cb0d34d..65ee51052d07 100644
--- a/src/sonic-yang-models/yang-models/sonic-ntp.yang
+++ b/src/sonic-yang-models/yang-models/sonic-ntp.yang
@@ -2,7 +2,7 @@ module sonic-ntp {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-system-ntp";
+    namespace "http://github.com/sonic-net/sonic-system-ntp";
     prefix ntp;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang b/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
index b10c35d94043..d010812b25ba 100644
--- a/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
+++ b/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
@@ -2,7 +2,7 @@ module sonic-nvgre-tunnel {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-nvgre-tunnel";
+    namespace "http://github.com/sonic-net/sonic-nvgre-tunnel";
     prefix nvgre;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-passwh.yang b/src/sonic-yang-models/yang-models/sonic-passwh.yang
index 8814bc2e5a29..347a740180db 100755
--- a/src/sonic-yang-models/yang-models/sonic-passwh.yang
+++ b/src/sonic-yang-models/yang-models/sonic-passwh.yang
@@ -1,6 +1,6 @@
 module sonic-passwh {
     yang-version 1.1;
-    namespace "http://github.com/Azure/sonic-passwh";
+    namespace "http://github.com/sonic-net/sonic-passwh";
     prefix password;
 
     description "PASSWORD HARDENING YANG Module for SONiC OS";
diff --git a/src/sonic-yang-models/yang-models/sonic-pbh.yang b/src/sonic-yang-models/yang-models/sonic-pbh.yang
index 21a4b5fecc69..54c728a939a1 100644
--- a/src/sonic-yang-models/yang-models/sonic-pbh.yang
+++ b/src/sonic-yang-models/yang-models/sonic-pbh.yang
@@ -2,7 +2,7 @@ module sonic-pbh {
 
 	yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-pbh";
+	namespace "http://github.com/sonic-net/sonic-pbh";
 	prefix pbh;
 
 	import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-peer-switch.yang b/src/sonic-yang-models/yang-models/sonic-peer-switch.yang
index 79a94c95c2c0..7f953c71bd1a 100644
--- a/src/sonic-yang-models/yang-models/sonic-peer-switch.yang
+++ b/src/sonic-yang-models/yang-models/sonic-peer-switch.yang
@@ -1,6 +1,6 @@
 module sonic-peer-switch {
     yang-version 1.1;
-    namespace "http://github.com/Azure/sonic-peer-switch";
+    namespace "http://github.com/sonic-net/sonic-peer-switch";
     prefix peer_switch;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-pfc-priority-priority-group-map.yang b/src/sonic-yang-models/yang-models/sonic-pfc-priority-priority-group-map.yang
index ccc86c064efb..8c537aa7a6b7 100644
--- a/src/sonic-yang-models/yang-models/sonic-pfc-priority-priority-group-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-pfc-priority-priority-group-map.yang
@@ -2,7 +2,7 @@ module sonic-pfc-priority-priority-group-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-pfc-priority-priority-group-map";
+    namespace "http://github.com/sonic-net/sonic-pfc-priority-priority-group-map";
 
     prefix pppgm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-pfc-priority-queue-map.yang b/src/sonic-yang-models/yang-models/sonic-pfc-priority-queue-map.yang
index fb659d89bb4b..805cf841786d 100644
--- a/src/sonic-yang-models/yang-models/sonic-pfc-priority-queue-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-pfc-priority-queue-map.yang
@@ -2,7 +2,7 @@ module sonic-pfc-priority-queue-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-pfc-priority-queue-map";
+    namespace "http://github.com/sonic-net/sonic-pfc-priority-queue-map";
 
     prefix ppqm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-pfcwd.yang b/src/sonic-yang-models/yang-models/sonic-pfcwd.yang
index 4ea0ffb8537f..27c2a49f2ed9 100644
--- a/src/sonic-yang-models/yang-models/sonic-pfcwd.yang
+++ b/src/sonic-yang-models/yang-models/sonic-pfcwd.yang
@@ -1,5 +1,5 @@
 module sonic-pfcwd {
-    namespace "http://github.com/Azure/sonic-pfcwd";
+    namespace "http://github.com/sonic-net/sonic-pfcwd";
     prefix sonic-pfcwd;
 
     yang-version 1.1;
diff --git a/src/sonic-yang-models/yang-models/sonic-port-qos-map.yang b/src/sonic-yang-models/yang-models/sonic-port-qos-map.yang
index 09dcb7ce9c39..6a2c69ab9935 100644
--- a/src/sonic-yang-models/yang-models/sonic-port-qos-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-port-qos-map.yang
@@ -2,7 +2,7 @@ module sonic-port-qos-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-port-qos-map";
+    namespace "http://github.com/sonic-net/sonic-port-qos-map";
 
     prefix pqm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-port.yang b/src/sonic-yang-models/yang-models/sonic-port.yang
index a60e6b1624a3..e2408d593ddb 100644
--- a/src/sonic-yang-models/yang-models/sonic-port.yang
+++ b/src/sonic-yang-models/yang-models/sonic-port.yang
@@ -2,7 +2,7 @@ module sonic-port{
 
 	yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-port";
+	namespace "http://github.com/sonic-net/sonic-port";
 	prefix port;
 
 	import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-portchannel.yang b/src/sonic-yang-models/yang-models/sonic-portchannel.yang
index 27df0625dfee..31235a0d2277 100644
--- a/src/sonic-yang-models/yang-models/sonic-portchannel.yang
+++ b/src/sonic-yang-models/yang-models/sonic-portchannel.yang
@@ -2,7 +2,7 @@ module sonic-portchannel {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-portchannel";
+    namespace "http://github.com/sonic-net/sonic-portchannel";
     prefix lag;
 
     import sonic-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-queue.yang b/src/sonic-yang-models/yang-models/sonic-queue.yang
index 8e24faa72cb0..e764f8149a36 100644
--- a/src/sonic-yang-models/yang-models/sonic-queue.yang
+++ b/src/sonic-yang-models/yang-models/sonic-queue.yang
@@ -2,7 +2,7 @@ module sonic-queue {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-queue";
+    namespace "http://github.com/sonic-net/sonic-queue";
 
     prefix squeue;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-restapi.yang b/src/sonic-yang-models/yang-models/sonic-restapi.yang
index af509f2335d8..094ed18eb7bd 100644
--- a/src/sonic-yang-models/yang-models/sonic-restapi.yang
+++ b/src/sonic-yang-models/yang-models/sonic-restapi.yang
@@ -2,7 +2,7 @@ module sonic-restapi {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-restapi";
+    namespace "http://github.com/sonic-net/sonic-restapi";
     prefix restapi;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-route-common.yang b/src/sonic-yang-models/yang-models/sonic-route-common.yang
index 9579739bcdd7..df0eae8f4ea9 100644
--- a/src/sonic-yang-models/yang-models/sonic-route-common.yang
+++ b/src/sonic-yang-models/yang-models/sonic-route-common.yang
@@ -1,5 +1,5 @@
 module sonic-route-common {
-    namespace "http://github.com/Azure/sonic-route-common";
+    namespace "http://github.com/sonic-net/sonic-route-common";
     prefix rtcmn;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-route-map.yang b/src/sonic-yang-models/yang-models/sonic-route-map.yang
index e4717cbc6288..cdfe5c6eda56 100644
--- a/src/sonic-yang-models/yang-models/sonic-route-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-route-map.yang
@@ -1,5 +1,5 @@
 module sonic-route-map {
-    namespace "http://github.com/Azure/sonic-route-map";
+    namespace "http://github.com/sonic-net/sonic-route-map";
     prefix rmap;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-routing-policy-sets.yang b/src/sonic-yang-models/yang-models/sonic-routing-policy-sets.yang
index 5b178831fb8d..9b3e18960c43 100644
--- a/src/sonic-yang-models/yang-models/sonic-routing-policy-sets.yang
+++ b/src/sonic-yang-models/yang-models/sonic-routing-policy-sets.yang
@@ -1,5 +1,5 @@
 module sonic-routing-policy-sets {
-    namespace "http://github.com/Azure/sonic-routing-policy-lists";
+    namespace "http://github.com/sonic-net/sonic-routing-policy-lists";
     prefix rpolsets;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-scheduler.yang b/src/sonic-yang-models/yang-models/sonic-scheduler.yang
index 8dcd4bef79b2..7e580d848d44 100644
--- a/src/sonic-yang-models/yang-models/sonic-scheduler.yang
+++ b/src/sonic-yang-models/yang-models/sonic-scheduler.yang
@@ -2,7 +2,7 @@ module sonic-scheduler {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-scheduler";
+    namespace "http://github.com/sonic-net/sonic-scheduler";
 
     prefix sch;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-sflow.yang b/src/sonic-yang-models/yang-models/sonic-sflow.yang
index 62984f064c51..adbeda80c4da 100644
--- a/src/sonic-yang-models/yang-models/sonic-sflow.yang
+++ b/src/sonic-yang-models/yang-models/sonic-sflow.yang
@@ -1,6 +1,6 @@
 module sonic-sflow{
 
-    namespace "http://github.com/Azure/sonic-sflow";
+    namespace "http://github.com/sonic-net/sonic-sflow";
     prefix sflow;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-snmp.yang b/src/sonic-yang-models/yang-models/sonic-snmp.yang
index 7e3db7b5dd09..68eebd2fa487 100644
--- a/src/sonic-yang-models/yang-models/sonic-snmp.yang
+++ b/src/sonic-yang-models/yang-models/sonic-snmp.yang
@@ -1,5 +1,5 @@
 module sonic-snmp {
-  namespace "http://github.com/Azure/sonic-snmp";
+  namespace "http://github.com/sonic-net/sonic-snmp";
   prefix ssnmp;
   yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-static-route.yang b/src/sonic-yang-models/yang-models/sonic-static-route.yang
index 48a562f242d9..019825b78881 100644
--- a/src/sonic-yang-models/yang-models/sonic-static-route.yang
+++ b/src/sonic-yang-models/yang-models/sonic-static-route.yang
@@ -1,6 +1,6 @@
 module sonic-static-route {
   yang-version 1.1;
-  namespace "http://github.com/Azure/sonic-static-route";
+  namespace "http://github.com/sonic-net/sonic-static-route";
   prefix sroute;
 
   import sonic-vrf {
diff --git a/src/sonic-yang-models/yang-models/sonic-storm-control.yang b/src/sonic-yang-models/yang-models/sonic-storm-control.yang
index 6d4e2b66a0f5..3f0e48d413a1 100644
--- a/src/sonic-yang-models/yang-models/sonic-storm-control.yang
+++ b/src/sonic-yang-models/yang-models/sonic-storm-control.yang
@@ -1,5 +1,5 @@
 module sonic-storm-control {
-    namespace "http://github.com/Azure/sonic-storm-control";
+    namespace "http://github.com/sonic-net/sonic-storm-control";
     yang-version "1";
 
     prefix ssc;
diff --git a/src/sonic-yang-models/yang-models/sonic-syslog.yang b/src/sonic-yang-models/yang-models/sonic-syslog.yang
index c2aa73827f0f..dc1925f463fa 100644
--- a/src/sonic-yang-models/yang-models/sonic-syslog.yang
+++ b/src/sonic-yang-models/yang-models/sonic-syslog.yang
@@ -2,7 +2,7 @@ module sonic-syslog {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-system-syslog";
+    namespace "http://github.com/sonic-net/sonic-system-syslog";
     prefix syslog;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-system-aaa.yang b/src/sonic-yang-models/yang-models/sonic-system-aaa.yang
index c3a442126959..f842d63cf6e8 100644
--- a/src/sonic-yang-models/yang-models/sonic-system-aaa.yang
+++ b/src/sonic-yang-models/yang-models/sonic-system-aaa.yang
@@ -1,5 +1,5 @@
 module sonic-system-aaa {
-    namespace "http://github.com/Azure/sonic-system-aaa";
+    namespace "http://github.com/sonic-net/sonic-system-aaa";
     prefix ssys;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang b/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang
index f82340b0e682..6abbcf3523b0 100644
--- a/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang
+++ b/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang
@@ -1,5 +1,5 @@
 module sonic-system-tacacs {
-    namespace "http://github.com/Azure/sonic-system-tacacs";
+    namespace "http://github.com/sonic-net/sonic-system-tacacs";
     prefix ssys;
     yang-version 1.1;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-tc-priority-group-map.yang b/src/sonic-yang-models/yang-models/sonic-tc-priority-group-map.yang
index 1b21673f58a0..e01fb7e6ac17 100644
--- a/src/sonic-yang-models/yang-models/sonic-tc-priority-group-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-tc-priority-group-map.yang
@@ -2,7 +2,7 @@ module sonic-tc-priority-group-map {
     
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-tc-priority-group-map";
+    namespace "http://github.com/sonic-net/sonic-tc-priority-group-map";
 
     prefix tpgm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-tc-queue-map.yang b/src/sonic-yang-models/yang-models/sonic-tc-queue-map.yang
index 3bcfab1f4598..c70a3ffe7eab 100644
--- a/src/sonic-yang-models/yang-models/sonic-tc-queue-map.yang
+++ b/src/sonic-yang-models/yang-models/sonic-tc-queue-map.yang
@@ -2,7 +2,7 @@ module sonic-tc-queue-map {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-tc-queue-map";
+    namespace "http://github.com/sonic-net/sonic-tc-queue-map";
 
     prefix tqm;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-telemetry.yang b/src/sonic-yang-models/yang-models/sonic-telemetry.yang
index 0164da5157eb..d3d7600a8e98 100644
--- a/src/sonic-yang-models/yang-models/sonic-telemetry.yang
+++ b/src/sonic-yang-models/yang-models/sonic-telemetry.yang
@@ -2,7 +2,7 @@ module sonic-telemetry {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-telemetry";
+    namespace "http://github.com/sonic-net/sonic-telemetry";
     prefix telemetry;
 
     import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-versions.yang b/src/sonic-yang-models/yang-models/sonic-versions.yang
index 156102122706..ad9b95f94180 100644
--- a/src/sonic-yang-models/yang-models/sonic-versions.yang
+++ b/src/sonic-yang-models/yang-models/sonic-versions.yang
@@ -2,7 +2,7 @@ module sonic-versions {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-versions";
+    namespace "http://github.com/sonic-net/sonic-versions";
     prefix versions;
 
 
diff --git a/src/sonic-yang-models/yang-models/sonic-vlan-sub-interface.yang b/src/sonic-yang-models/yang-models/sonic-vlan-sub-interface.yang
index bc13113ef53e..5a7f02c75143 100644
--- a/src/sonic-yang-models/yang-models/sonic-vlan-sub-interface.yang
+++ b/src/sonic-yang-models/yang-models/sonic-vlan-sub-interface.yang
@@ -2,7 +2,7 @@ module sonic-vlan-sub-interface {
 
     yang-version 1.1;
 
-    namespace  "http://github.com/Azure/sonic-vlan-sub-interface";
+    namespace  "http://github.com/sonic-net/sonic-vlan-sub-interface";
 
     prefix vlan-sub-interface;
 
diff --git a/src/sonic-yang-models/yang-models/sonic-vlan.yang b/src/sonic-yang-models/yang-models/sonic-vlan.yang
index 48ec466b825b..b8f3e28c43f7 100644
--- a/src/sonic-yang-models/yang-models/sonic-vlan.yang
+++ b/src/sonic-yang-models/yang-models/sonic-vlan.yang
@@ -2,7 +2,7 @@ module sonic-vlan {
 
     yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-vlan";
+	namespace "http://github.com/sonic-net/sonic-vlan";
 	prefix vlan;
 
 	import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-vrf.yang b/src/sonic-yang-models/yang-models/sonic-vrf.yang
index 0d7d0561dd1b..ff9fc5b5a4cc 100644
--- a/src/sonic-yang-models/yang-models/sonic-vrf.yang
+++ b/src/sonic-yang-models/yang-models/sonic-vrf.yang
@@ -1,5 +1,5 @@
 module sonic-vrf {
-    namespace "http://github.com/Azure/sonic-vrf";
+    namespace "http://github.com/sonic-net/sonic-vrf";
     prefix vrf;
     
     import sonic-extension {
diff --git a/src/sonic-yang-models/yang-models/sonic-vxlan.yang b/src/sonic-yang-models/yang-models/sonic-vxlan.yang
index 6a9b4ffb5e3b..fc23ea9141a0 100644
--- a/src/sonic-yang-models/yang-models/sonic-vxlan.yang
+++ b/src/sonic-yang-models/yang-models/sonic-vxlan.yang
@@ -1,6 +1,6 @@
 module sonic-vxlan {
     yang-version 1.1;
-    namespace "http://github.com/Azure/sonic-vxlan";
+    namespace "http://github.com/sonic-net/sonic-vxlan";
     prefix svxlan;
 
     import ietf-yang-types {
diff --git a/src/sonic-yang-models/yang-models/sonic-warm-restart.yang b/src/sonic-yang-models/yang-models/sonic-warm-restart.yang
index 8366016746ad..3025260d275d 100644
--- a/src/sonic-yang-models/yang-models/sonic-warm-restart.yang
+++ b/src/sonic-yang-models/yang-models/sonic-warm-restart.yang
@@ -2,7 +2,7 @@ module sonic-warm-restart  {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-warm-restart";
+    namespace "http://github.com/sonic-net/sonic-warm-restart";
     prefix wrm;
 
     description "SONIC WARMRESTART";
diff --git a/src/sonic-yang-models/yang-models/sonic-wred-profile.yang b/src/sonic-yang-models/yang-models/sonic-wred-profile.yang
index 2ca7be26ca0f..2f3559a23f9b 100644
--- a/src/sonic-yang-models/yang-models/sonic-wred-profile.yang
+++ b/src/sonic-yang-models/yang-models/sonic-wred-profile.yang
@@ -2,7 +2,7 @@ module sonic-wred-profile {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-wred-profile";
+    namespace "http://github.com/sonic-net/sonic-wred-profile";
 
     prefix wrd;
 
diff --git a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2
index e9461be2ceed..2658016575e9 100644
--- a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2
+++ b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2
@@ -7,7 +7,7 @@ module sonic-acl {
 
 	yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-acl";
+	namespace "http://github.com/sonic-net/sonic-acl";
 	prefix acl;
 
 	import ietf-inet-types {
diff --git a/src/sonic-yang-models/yang-templates/sonic-extension.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-extension.yang.j2
index 142ef517b7c2..2ee583f1811f 100644
--- a/src/sonic-yang-models/yang-templates/sonic-extension.yang.j2
+++ b/src/sonic-yang-models/yang-templates/sonic-extension.yang.j2
@@ -2,7 +2,7 @@ module sonic-extension {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-extension";
+    namespace "http://github.com/sonic-net/sonic-extension";
     prefix sonic-extension;
 
     description "Extension yang Module for SONiC OS";
diff --git a/src/sonic-yang-models/yang-templates/sonic-policer.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-policer.yang.j2
index a8c6f1445a46..90bba27425a2 100644
--- a/src/sonic-yang-models/yang-templates/sonic-policer.yang.j2
+++ b/src/sonic-yang-models/yang-templates/sonic-policer.yang.j2
@@ -7,7 +7,7 @@ module sonic-policer {
 
 	yang-version 1.1;
 
-	namespace "http://github.com/Azure/sonic-policer";
+	namespace "http://github.com/sonic-net/sonic-policer";
 	prefix policer;
 
 	import sonic-types {
diff --git a/src/sonic-yang-models/yang-templates/sonic-types.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-types.yang.j2
index 9de37d2cfc08..f0cd6750f1f8 100644
--- a/src/sonic-yang-models/yang-templates/sonic-types.yang.j2
+++ b/src/sonic-yang-models/yang-templates/sonic-types.yang.j2
@@ -2,7 +2,7 @@ module sonic-types {
 
     yang-version 1.1;
 
-    namespace "http://github.com/Azure/sonic-head";
+    namespace "http://github.com/sonic-net/sonic-head";
     prefix sonic-types;
 
     description "SONiC type for yang Models of SONiC OS";