diff --git a/bobbycar.csv b/bobbycar.csv
deleted file mode 100644
index 28c65bd..0000000
--- a/bobbycar.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x5000,
-otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x2F0000,
-app1,     app,  ota_1,   0x300000, 0x2F0000,
-spiffs,   data, spiffs,  0x5F0000, 0x100000,
diff --git a/bobbycar_noota.csv b/bobbycar_noota.csv
deleted file mode 100644
index 884e7a2..0000000
--- a/bobbycar_noota.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x5000,
-otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x2F0000,
-spiffs,   data, spiffs,  0x300000, 0x100000,
diff --git a/init_ide.sh b/init_ide.sh
index d613a2c..3f4efb8 100755
--- a/init_ide.sh
+++ b/init_ide.sh
@@ -11,7 +11,8 @@ echo "OTHER_FILES += \\" >> platformio.pro
 #    echo "    $i \\" >> platformio.pro
 #done
 
-echo "    bobbycar.csv \\" >> platformio.pro
-echo "    bobbycar_noota.csv \\" >> platformio.pro
+echo "    partitions_16M_ota.csv \\" >> platformio.pro
+echo "    partitions_4M_noota.csv \\" >> platformio.pro
+echo "    partitions_4M_ota.csv \\" >> platformio.pro
 echo "    LICENSE" >> platformio.pro
 echo "    README.md" >> platformio.pro
diff --git a/partitions_16M_ota.csv b/partitions_16M_ota.csv
new file mode 100644
index 0000000..9fd97b3
--- /dev/null
+++ b/partitions_16M_ota.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xe000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x2F0000,
+app1,     app,  ota_1,   0x300000, 0x2F0000,
+spiffs,   data, spiffs,  0x5F0000, 0x100000,
diff --git a/partitions_4M_noota.csv b/partitions_4M_noota.csv
new file mode 100644
index 0000000..5af0217
--- /dev/null
+++ b/partitions_4M_noota.csv
@@ -0,0 +1,4 @@
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xe000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x3F0000,
diff --git a/partitions_4M_ota.csv b/partitions_4M_ota.csv
new file mode 100644
index 0000000..f378c3c
--- /dev/null
+++ b/partitions_4M_ota.csv
@@ -0,0 +1,5 @@
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xe000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x1F0000,
+app1,     app,  ota_1,   0x200000, 0x1F0000,
diff --git a/platformio.ini b/platformio.ini
index 7ddb726..a1044dd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -85,22 +85,12 @@ build_flags =
     -DPINS_GAS=33
     -DPINS_BREMS=35
 
-[ota_common]
-board_build.partitions = bobbycar.csv
-build_flags =
-    -DFEATURE_OTA
-
-[no_ota_common]
-board_build.partitions = bobbycar_noota.csv
-build_flags =
-
-
 [feedc0de]
 platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
 platform_packages = ${common_env_data.platform_packages}
-board_build.partitions = ${no_ota_common.board_build.partitions}
+board_build.partitions = partitions_4M_noota.csv
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
@@ -128,11 +118,11 @@ build_flags =
 ;  -DPINS_MOSFET0=18
 ;  -DPINS_MOSFET1=19
 ;  -DPINS_MOSFET2=21
-  ${no_ota_common.build_flags}
   ${default_limits.build_flags}
   -DDEVICE_PREFIX=bobbyquad
   -DAP_PASSWORD=Passwort_123
   -DFEATURE_WEBSERVER
+;  -DFEATURE_OTA
   -DFEATURE_DPAD_5WIRESW
   -DPINS_DPAD_5WIRESW_OUT=32
   -DPINS_DPAD_5WIRESW_IN1=25
@@ -200,19 +190,19 @@ platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
 platform_packages = ${common_env_data.platform_packages}
-board_build.partitions = ${ota_common.board_build.partitions}
+board_build.partitions = partitions_16M_ota.csv
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
 build_flags =
   ${common_env_data.build_flags}
   ${peters_platine.build_flags}
-  ${ota_common.build_flags}
   ${default_limits.build_flags}
   ${default_wheels_inverted.build_flags}
   -DDEVICE_PREFIX=bobbycar
   -DAP_PASSWORD=Passwort_123
   -DFEATURE_WEBSERVER
+  -DFEATURE_OTA
   -DDEFAULT_GASMIN=400
   -DDEFAULT_GASMAX=2000
   -DDEFAULT_BREMSMIN=600
@@ -258,7 +248,7 @@ platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
 platform_packages = ${common_env_data.platform_packages}
-board_build.partitions = ${ota_common.board_build.partitions}
+board_build.partitions = partitions_16M_ota.csv
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
@@ -269,12 +259,12 @@ upload_port = /dev/ttyUSB*
 build_flags =
   ${common_env_data.build_flags}
   ${peters_platine.build_flags}
-  ${ota_common.build_flags}
   ${default_limits.build_flags}
   ${default_wheels_inverted.build_flags}
   -DDEVICE_PREFIX=bobbyquad
   -DAP_PASSWORD=Passwort_123
   -DFEATURE_WEBSERVER
+  -DFEATURE_OTA
   -DFEATURE_DPAD
   -DPINS_DPAD_UP=32
   -DPINS_DPAD_DOWN=22
@@ -292,7 +282,7 @@ platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
 platform_packages = ${common_env_data.platform_packages}
-board_build.partitions = ${no_ota_common.board_build.partitions}
+board_build.partitions = partitions_4M_ota.csv
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
@@ -302,11 +292,11 @@ upload_speed = 921600
 
 build_flags =
   ${common_env_data.build_flags}
-  ${no_ota_common.build_flags}
   ${default_limits.build_flags}
   -DDEVICE_PREFIX=bobbyquad
   -DAP_PASSWORD=Passwort_123
   -DFEATURE_WEBSERVER
+  -DFEATURE_OTA
   -DRPI_DISPLAY_TYPE
   -DR61581_DRIVER
 ; TODO: TFT_MISO (touch MISO?)
@@ -341,19 +331,19 @@ platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
 platform_packages = ${common_env_data.platform_packages}
-board_build.partitions = ${ota_common.board_build.partitions}
+board_build.partitions = partitions_16M_ota.csv
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
 build_flags =
   ${common_env_data.build_flags}
   ${peters_platine_reversed.build_flags}
-  ${ota_common.build_flags}
   ${default_limits.build_flags}
   ${default_wheels_inverted.build_flags}
   -DDEVICE_PREFIX=bobbycar
   -DAP_PASSWORD=Passwort_123
   -DFEATURE_WEBSERVER
+  -DFEATURE_OTA
   -DDEFAULT_GASMIN=1000
   -DDEFAULT_GASMAX=4000
   -DDEFAULT_BREMSMIN=200