diff --git a/platformio-tools.ini b/platformio-tools.ini
index b7480ec..ba718e1 100644
--- a/platformio-tools.ini
+++ b/platformio-tools.ini
@@ -20,11 +20,11 @@ board = esp12e
 build_flags =
   ${env.build_flags}
   -D BOARD=BOARD_SLIMEVR
-  -D VENDOR_NAME="SlimeVR"
-  -D VENDOR_URL="https://slimevr.dev"
-  -D PRODUCT_NAME="SlimeVR Tracker"
-  -D UPDATE_ADDRESS="SlimeVR/SlimeVR-Tracker-ESP"
-  -D UPDATE_NAME="BOARD_SLIMEVR-firmware"
+  -D VENDOR_NAME='"SlimeVR"'
+  -D VENDOR_URL='"https://slimevr.dev"'
+  -D PRODUCT_NAME='"SlimeVR Tracker"'
+  -D UPDATE_ADDRESS='"SlimeVR/SlimeVR-Tracker-ESP"'
+  -D UPDATE_NAME='"BOARD_SLIMEVR-firmware"'
 
 [env:BOARD_SLIMEVR_V1_2]
 platform = espressif8266 @ 4.2.1
@@ -32,11 +32,11 @@ board = esp12e
 build_flags =
   ${env.build_flags}
   -D BOARD=BOARD_SLIMEVR_V1_2
-  -D VENDOR_NAME="SlimeVR"
-  -D VENDOR_URL="https://slimevr.dev"
-  -D PRODUCT_NAME="SlimeVR Tracker v1.2"
-  -D UPDATE_ADDRESS="SlimeVR/SlimeVR-Tracker-ESP"
-  -D UPDATE_NAME="BOARD_SLIMEVR_V1_2-firmware"
+  -D VENDOR_NAME='"SlimeVR"'
+  -D VENDOR_URL='"https://slimevr.dev"'
+  -D PRODUCT_NAME='"SlimeVR Tracker v1.2"'
+  -D UPDATE_ADDRESS='"SlimeVR/SlimeVR-Tracker-ESP"'
+  -D UPDATE_NAME='"BOARD_SLIMEVR_V1_2-firmware"'
 
 [env:BOARD_SLIMEVR_DEV]
 platform = espressif8266 @ 4.2.1
@@ -44,8 +44,8 @@ board = esp12e
 build_flags =
   ${env.build_flags}
   -D BOARD=BOARD_SLIMEVR_DEV
-  -D VENDOR_NAME="SlimeVR"
-  -D PRODUCT_NAME="SlimeVR Tracker (dev)"
+  -D VENDOR_NAME='"SlimeVR"'
+  -D PRODUCT_NAME='"SlimeVR Tracker (dev)"'
 
 [env:BOARD_GLOVE_IMU_SLIMEVR_DEV]
 platform = espressif32 @ 6.7.0
@@ -56,7 +56,7 @@ build_flags =
   ${env.build_flags}
   -DESP32C3
   -D BOARD=BOARD_GLOVE_IMU_SLIMEVR_DEV
-  -D PRODUCT_NAME="SlimeVR Glove (dev)"
+  -D PRODUCT_NAME='"SlimeVR Glove (dev)"'
 board = lolin_c3_mini
 
 [env:BOARD_NODEMCU]
diff --git a/platformio.ini b/platformio.ini
index fd7dbd0..f7e712f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -68,6 +68,14 @@ board = esp12e
 ; Comment out this line below if you have any trouble uploading the firmware
 ; and if it has a CP2102 on it (a square chip next to the usb port): change to 3000000 (3 million) for even faster upload speed
 upload_speed = 921600
+build_flags =
+  ${env.build_flags}
+  -D BOARD=BOARD_SLIMEVR_V1_2
+  -D VENDOR_NAME='"SlimeVR"'
+  -D VENDOR_URL='"https://slimevr.dev"'
+  -D PRODUCT_NAME='"SlimeVR Tracker v1.2"'
+  -D UPDATE_ADDRESS='"SlimeVR/SlimeVR-Tracker-ESP"'
+  -D UPDATE_NAME='"BOARD_SLIMEVR_V1_2-firmware"'
 
 ; Uncomment below if you want to build for ESP-01
 ;[env:esp01_1m]