diff --git a/ThirdParty/sw_services/lwip141/data/lwip141.mld b/ThirdParty/sw_services/lwip141/data/lwip141.mld
index 0166b1d2..370ffc15 100755
--- a/ThirdParty/sw_services/lwip141/data/lwip141.mld
+++ b/ThirdParty/sw_services/lwip141/data/lwip141.mld
@@ -6,7 +6,7 @@ BEGIN LIBRARY lwip141
   OPTION copyfiles = all;
   OPTION desc = "lwIP TCP/IP Stack library: lwIP v1.4.1";
   OPTION app_linker_flags = "-Wl,--start-group,-lxil,-llwip4,-lgcc,-lc,--end-group";
-  OPTION requires_os = (standalone xilkernel freertos821_xilinx);
+  OPTION requires_os = (standalone xilkernel freertos823_xilinx);
   OPTION VERSION = 1.3;
   OPTION NAME = lwip141;
 
diff --git a/ThirdParty/sw_services/lwip141/data/lwip141.tcl b/ThirdParty/sw_services/lwip141/data/lwip141.tcl
index 7c5d5ef6..09d87818 100755
--- a/ThirdParty/sw_services/lwip141/data/lwip141.tcl
+++ b/ThirdParty/sw_services/lwip141/data/lwip141.tcl
@@ -239,7 +239,7 @@ proc lwip_sw_drc {libhandle emacs_list} {
 		set os_handle [hsi::get_os]
 		set os_name [common::get_property NAME $os_handle]
 		if { [string compare -nocase "xilkernel" $os_name] != 0} {
-			if { [string compare -nocase "freertos821_xilinx" $os_name] != 0} {
+			if { [string compare -nocase "freertos823_xilinx" $os_name] != 0} {
 				error "ERROR: lwIP with Sockets requires \"xilkernel or freertos\" OS" "" "mdt_error"
 			}
 		}
@@ -443,7 +443,7 @@ proc generate_lwip_opts {libhandle} {
 			puts $lwipopts_fd "\#define TCPIP_THREAD_STACKSIZE 4096"
 			puts $lwipopts_fd ""
 		}
-		if { [string compare -nocase "freertos821_xilinx" $os_name] == 0} {
+		if { [string compare -nocase "freertos823_xilinx" $os_name] == 0} {
 			puts $lwipopts_fd "\#define OS_IS_FREERTOS"
 			puts $lwipopts_fd "\#define DEFAULT_THREAD_PRIO $thread_prio"
 			puts $lwipopts_fd "\#define TCPIP_THREAD_PRIO ($thread_prio + 1)"
diff --git a/ThirdParty/sw_services/xilopenamp/data/xilopenamp.mld b/ThirdParty/sw_services/xilopenamp/data/xilopenamp.mld
index fe8d4bff..b115bd0e 100755
--- a/ThirdParty/sw_services/xilopenamp/data/xilopenamp.mld
+++ b/ThirdParty/sw_services/xilopenamp/data/xilopenamp.mld
@@ -43,7 +43,7 @@ OPTION psf_version = 2.1;
 BEGIN LIBRARY xilopenamp
   OPTION DRC = openamp_drc;
   OPTION COPYFILES = all;
-  OPTION REQUIRES_OS = (standalone, freertos821_xilinx);
+  OPTION REQUIRES_OS = (standalone, freertos823_xilinx);
   OPTION APP_LINKER_FLAGS = "-Wl,--start-group,-lxil,-lxilopenamp,-lgcc,-lc,--end-group";
   OPTION DESC = "Xilinx openamp Library ";
   OPTION VERSION = 1.0;
diff --git a/ThirdParty/sw_services/xilopenamp/data/xilopenamp.tcl b/ThirdParty/sw_services/xilopenamp/data/xilopenamp.tcl
index 0cb08bc7..537fe580 100755
--- a/ThirdParty/sw_services/xilopenamp/data/xilopenamp.tcl
+++ b/ThirdParty/sw_services/xilopenamp/data/xilopenamp.tcl
@@ -86,7 +86,7 @@ proc xgen_opts_file {libhandle} {
 	puts $ampos "/******************************************************************/"
 	puts $ampos ""
 	puts $ampos "/* Operating System definition */"
-	if { $os == "freertos821_xilinx" } {
+	if { $os == "freertos823_xilinx" } {
 		puts $ampos "#define USE_FREERTOS TRUE"
 	      } else {
 		puts $ampos "#define USE_BAREMETAL TRUE"
diff --git a/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl b/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl
index 64d19237..cffd71c5 100755
--- a/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl
+++ b/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl
@@ -46,8 +46,8 @@ proc check_freertos_os {} {
     }
     set os [lindex $oslist 0];
 
-    if { $os != "freertos821_xilinx" } {
-        error "This application is supported only on the freertos821_xilinx.";
+    if { $os != "freertos823_xilinx" } {
+        error "This application is supported only on the freertos823_xilinx.";
     }
 }
 
@@ -99,5 +99,5 @@ proc swapp_get_supported_processors {} {
 }
 
 proc swapp_get_supported_os {} {
-    return "freertos821_xilinx";
+    return "freertos823_xilinx";
 }
diff --git a/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl b/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl
index 0bf3a4be..846678f7 100755
--- a/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl
+++ b/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl
@@ -46,8 +46,8 @@ proc check_standalone_os {} {
     }
     set os [lindex $oslist 0];
 
-    if { ( $os != "standalone" ) && ( $os != "freertos821_xilinx" ) } {
-        error "This application is supported only on the Standalone Board Support Package and freertos821.";
+    if { ( $os != "standalone" ) && ( $os != "freertos823_xilinx" ) } {
+        error "This application is supported only on the Standalone Board Support Package and freertos823_xilinx.";
     }
 }
 
@@ -138,5 +138,5 @@ proc swapp_get_supported_processors {} {
 }
 
 proc swapp_get_supported_os {} {
-    return "freertos821_xilinx standalone";
+    return "freertos823_xilinx standalone";
 }
\ No newline at end of file
diff --git a/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl b/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl
index e8a2f98a..ca6cc27e 100755
--- a/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl
+++ b/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl
@@ -46,8 +46,8 @@ proc check_standalone_os {} {
     }
     set os [lindex $oslist 0];
 
-    if { ( $os != "standalone" ) && ( $os != "freertos821_xilinx" ) } {
-        error "This application is supported only on the Standalone Board Support Package and freertos821.";
+    if { ( $os != "standalone" ) && ( $os != "freertos823_xilinx" ) } {
+        error "This application is supported only on the Standalone Board Support Package and freertos823_xilinx.";
     }
 }
 
@@ -138,5 +138,5 @@ proc swapp_get_supported_processors {} {
 }
 
 proc swapp_get_supported_os {} {
-    return "freertos821_xilinx standalone";
+    return "freertos823_xilinx standalone";
 }
\ No newline at end of file
diff --git a/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl b/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl
index 451cc968..d4771480 100755
--- a/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl
+++ b/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl
@@ -46,8 +46,8 @@ proc check_standalone_os {} {
     }
     set os [lindex $oslist 0];
 
-    if { ( $os != "standalone" ) && ( $os != "freertos821_xilinx" ) } {
-        error "This application is supported only on the Standalone Board Support Package and freertos821.";
+    if { ( $os != "standalone" ) && ( $os != "freertos823_xilinx" ) } {
+        error "This application is supported only on the Standalone Board Support Package and freertos823_xilinx.";
     }
 }
 
@@ -140,5 +140,5 @@ proc swapp_get_supported_processors {} {
 }
 
 proc swapp_get_supported_os {} {
-    return "freertos821_xilinx standalone";
+    return "freertos823_xilinx standalone";
 }
\ No newline at end of file