diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6af5d48..5f0bdb49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   APP_NAME: 'Esp Box Emu'
-  IDF_VERSION: 'v5.5.1'
+  IDF_VERSION: 'v6.0.1'
   IDF_COMPONENT_MANAGER: "1" # whether to enable the component manager or not
   FLASH_TOTAL_OVERRIDE: '6291456' # 6MB flash app partition for main app
 
diff --git a/.github/workflows/package_main.yml b/.github/workflows/package_main.yml
index 929491b4..dba44573 100644
--- a/.github/workflows/package_main.yml
+++ b/.github/workflows/package_main.yml
@@ -10,7 +10,7 @@ on:
 env:
   APP_NAME: 'Esp Box Emu'
   IDF_TARGET: 'esp32s3'
-  IDF_VERSION: 'v5.5.1'
+  IDF_VERSION: 'v6.0.1'
   IDF_COMPONENT_MANAGER: "1" # whether to enable the component manager or not
   FLASH_TOTAL_OVERRIDE: '6291456' # 6MB flash app partition for main app
 
diff --git a/components/gbc/gnuboy/src/save.c b/components/gbc/gnuboy/src/save.c
index 6fa104ad..a4cc908a 100644
--- a/components/gbc/gnuboy/src/save.c
+++ b/components/gbc/gnuboy/src/save.c
@@ -32,7 +32,10 @@
 struct svar
 {
 	int len;
-	char key[4];
+	/* 4-byte fixed tag, not a NUL-terminated string (initialized with exactly
+	 * 4 chars, e.g. "GbSs" / "PC  "). The 'nonstring' attribute silences GCC 15's
+	 * -Wunterminated-string-initialization. */
+	char key[4] __attribute__((nonstring));
 	void *ptr;
 };
 
diff --git a/components/msx/fmsx/src/EMULib/Record.c b/components/msx/fmsx/src/EMULib/Record.c
index 8715ad5d..42adc249 100644
--- a/components/msx/fmsx/src/EMULib/Record.c
+++ b/components/msx/fmsx/src/EMULib/Record.c
@@ -357,7 +357,9 @@ unsigned int RPLCount(void)
 /*************************************************************/
 int SaveRPL(const char *FileName)
 {
-  static unsigned char Header[16] = "RPL\032\001\0\0\0\0\0\0\0\0\0\0\0";
+  /* Fixed 16-byte file magic, not a NUL-terminated string; 'nonstring'
+   * silences GCC 15's -Wunterminated-string-initialization. */
+  static unsigned char Header[16] __attribute__((nonstring)) = "RPL\032\001\0\0\0\0\0\0\0\0\0\0\0";
   unsigned char Buf[16];
   FILE *F;
   int J,K;
diff --git a/components/msx/fmsx/src/fMSX/State.h b/components/msx/fmsx/src/fMSX/State.h
index 3637fe2d..93d78503 100644
--- a/components/msx/fmsx/src/fMSX/State.h
+++ b/components/msx/fmsx/src/fMSX/State.h
@@ -243,7 +243,9 @@ unsigned int LoadState(unsigned char *Buf,unsigned int MaxSize)
 /*************************************************************/
 int SaveSTA(const char *Name)
 {
-  static byte Header[16] = "STE\032\003\0\0\0\0\0\0\0\0\0\0\0";
+  /* Fixed 16-byte file magic, not a NUL-terminated string; 'nonstring'
+   * silences GCC 15's -Wunterminated-string-initialization. */
+  static byte Header[16] __attribute__((nonstring)) = "STE\032\003\0\0\0\0\0\0\0\0\0\0\0";
   unsigned int J,Size;
   byte *Buf;
   FILE *F;