diff --git a/CODEOWNERS b/CODEOWNERS
index 771203f3db..0fe8596a2f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -10,15 +10,14 @@ MAINTAINERS                              @inakypg @nashif
 arch/arc/*                               @cjordan44 @ruuddw
 arch/arc/core/*                          @andrewboie
 arch/arm/*                               @MaureenHelm @galak
-arch/arm/core/*                          @andrewboie
 arch/arm/soc/arm/mps2/*                  @fvincenzo
 arch/arm/soc/atmel_sam/sam4s             @fallrisk
 arch/arm/soc/st_stm32/*                  @erwango
 arch/arm/soc/st_stm32/stm32f4/*          @rsalveti @idlethread
 arch/arm/soc/ti_simplelink/cc32xx        @GAnthony
 arch/arm/soc/ti_simplelink/msp432p4xx    @Mani-Sadhasivam
-arch/nios2/*                             @andrewboie
-arch/nios2/core/*                        @andrewboie
+arch/nios2/*                             @andrewboie @ramakrishnapallala
+arch/nios2/core/*                        @andrewboie @ramakrishnapallala
 arch/posix/*                             @aescolar-ot
 arch/riscv32                             @fractalclone @kgugala @pgielda
 arch/x86/*                               @andrewboie @youvedeep
@@ -27,7 +26,7 @@ arch/x86/core/crt0.S                     @youvedeep @nashif
 arch/x86/soc/intel_quark/quark_d2000/*   @nashif
 arch/x86/soc/intel_quark/quark_se/*      @nashif
 arch/x86/soc/intel_quark/quark_x1000/*   @nashif
-arch/xtensa/*                            @andrewboie
+arch/xtensa/*                            @andrewboie @rgundi @andyross
 boards/arc/*                             @cjordan44 @ruuddw
 boards/arc/arduino_101_sss/*             @nashif
 boards/arc/em_starterkit/*               @cjordan44
@@ -55,12 +54,12 @@ boards/nios2/*                           @ramakrishnapallala
 boards/nios2/altera_max10/*              @ramakrishnapallala
 boards/posix/*                           @aescolar-ot
 boards/riscv32                           @fractalclone @kgugala @pgielda
-boards/x86/*                             @andrewboie @youvedeep
+boards/x86/*                             @andrewboie @nashif
 boards/x86/arduino_101/*                 @nashif
 boards/x86/galileo/*                     @nashif
 boards/x86/quark_d2000_crb/*             @nashif
 boards/x86/quark_se_c1000_devboard/*     @nashif
-boards/xtensa/*                          @andrewboie
+boards/xtensa/*                          @andrewboie @ramakrishnapallala
 # All cmake related files
 cmake/*                                  @nashif @SebastianBoe
 /CMakeLists.txt                          @nashif @SebastianBoe
@@ -95,7 +94,7 @@ drivers/usb                              @youvedeep @andyross
 drivers/usb/device/usb_dc_stm32.c        @ydamigos @loicpoulain
 drivers/i2c/i2c_ll_stm32*                @ldts @ydamigos
 dts/arm/st/*                             @erwango
-ext/fs/*                                 @nashif
+ext/fs/*                                 @nashif @ramakrishnapallala
 ext/hal/cmsis/*                          @MaureenHelm @galak
 ext/hal/nordic/mdk/*                     @carlescufi
 ext/hal/nxp/mcux/*                       @MaureenHelm
@@ -124,8 +123,8 @@ include/drivers/bluetooth/*              @sjanc @jhedberg @Vudentz
 include/drivers/ioapic.h                 @andrewboie
 include/drivers/loapic.h                 @andrewboie
 include/drivers/mvic.h                   @andrewboie
-include/fs.h                             @nashif
-include/fs/*                             @nashif
+include/fs.h                             @nashif @ramakrishnapallala
+include/fs/*                             @nashif @ramakrishnapallala
 include/init.h                           @andrewboie @andyross
 include/irq.h                            @andrewboie @andyross
 include/irq_offload.h                    @andrewboie @andyross
@@ -193,4 +192,4 @@ tests/net/lib/*                          @jukkar @tbursztyka
 tests/net/lib/http_header_fields/*       @jukkar @tbursztyka
 tests/net/lib/mqtt_packet/*              @jukkar @tbursztyka
 tests/net/lib/coap/*                     @rveerama1
-tests/subsys/fs/*                        @nashif
+tests/subsys/fs/*                        @nashif @ramakrishnapallala