diff --git a/demos/STM32/RT-STM32G031K8-NUCLEO32/Makefile b/demos/STM32/RT-STM32G031K8-NUCLEO32/Makefile
index bbce45cd5..714489d21 100644
--- a/demos/STM32/RT-STM32G031K8-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32G031K8-NUCLEO32/Makefile
@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -Og -ggdb -fomit-frame-pointer -falign-functions=16
+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
 endif
 
 # C specific options here (added to USE_OPT).
@@ -55,13 +55,13 @@ endif
 # Stack size to be allocated to the Cortex-M process stack. This stack is
 # the stack used by the main() thread.
 ifeq ($(USE_PROCESS_STACKSIZE),)
-  USE_PROCESS_STACKSIZE = 0x400
+  USE_PROCESS_STACKSIZE = 0x200
 endif
 
 # Stack size to the allocated to the Cortex-M main/exceptions stack. This
 # stack is used for processing interrupts and exceptions.
 ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
-  USE_EXCEPTIONS_STACKSIZE = 0x400
+  USE_EXCEPTIONS_STACKSIZE = 0x100
 endif
 
 # Enables the use of FPU (no, softfp, hard).
diff --git a/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c b/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c
index 47d7bc155..ee8005dca 100644
--- a/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c
@@ -19,7 +19,7 @@
 
 #include "shell.h"
 
-#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)
+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(512)
 
 static const ShellCommand commands[] = {
   {NULL, NULL}