diff --git a/device-oriole.mk b/device-oriole.mk
index 353bfac..6476916 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -70,22 +70,22 @@
 
 # Voice packs for Text-To-Speech
 PRODUCT_COPY_FILES += \
-	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\
-	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\
-	device/google/raviole/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
+	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r24.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r24.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r24.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-r24.zvoice:product/tts/google/de-de/de-de-x-multi-r24.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-amb-r22.zvoice:product/tts/google/it-it/it-it-x-amb-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-ita-r22.zvoice:product/tts/google/it-it/it-it-x-ita-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itb-r22.zvoice:product/tts/google/it-it/it-it-x-itb-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itc-r22.zvoice:product/tts/google/it-it/it-it-x-itc-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itd-r22.zvoice:product/tts/google/it-it/it-it-x-itd-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-kda-r22.zvoice:product/tts/google/it-it/it-it-x-kda-r22.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-ana-r23.zvoice:product/tts/google/es-es/es-es-x-ana-r23.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/oriole
diff --git a/device-raven.mk b/device-raven.mk
index 4a40f7e..e9af790 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -71,22 +71,22 @@
 
 # Voice packs for Text-To-Speech
 PRODUCT_COPY_FILES += \
-	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\
-	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\
-	device/google/raviole/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
+	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r24.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r24.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r24.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r24.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-r24.zvoice:product/tts/google/de-de/de-de-x-multi-r24.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-amb-r22.zvoice:product/tts/google/it-it/it-it-x-amb-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-ita-r22.zvoice:product/tts/google/it-it/it-it-x-ita-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itb-r22.zvoice:product/tts/google/it-it/it-it-x-itb-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itc-r22.zvoice:product/tts/google/it-it/it-it-x-itc-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itd-r22.zvoice:product/tts/google/it-it/it-it-x-itd-r22.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-kda-r22.zvoice:product/tts/google/it-it/it-it-x-kda-r22.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-ana-r23.zvoice:product/tts/google/es-es/es-es-x-ana-r23.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
diff --git a/tts/de-de/de-de-x-multi-r23.zvoice b/tts/de-de/de-de-x-multi-r23.zvoice
deleted file mode 100644
index 57dc1ec..0000000
--- a/tts/de-de/de-de-x-multi-r23.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/de-de/de-de-x-multi-r24.zvoice b/tts/de-de/de-de-x-multi-r24.zvoice
new file mode 100644
index 0000000..44169eb
--- /dev/null
+++ b/tts/de-de/de-de-x-multi-r24.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-ana-r22.zvoice b/tts/es-es/es-es-x-ana-r23.zvoice
similarity index 70%
rename from tts/es-es/es-es-x-ana-r22.zvoice
rename to tts/es-es/es-es-x-ana-r23.zvoice
index bcf4d30..d8d8dcc 100644
--- a/tts/es-es/es-es-x-ana-r22.zvoice
+++ b/tts/es-es/es-es-x-ana-r23.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-multi-r22.zvoice b/tts/es-es/es-es-x-multi-r23.zvoice
similarity index 98%
rename from tts/es-es/es-es-x-multi-r22.zvoice
rename to tts/es-es/es-es-x-multi-r23.zvoice
index 1ab7629..552c5a4 100644
--- a/tts/es-es/es-es-x-multi-r22.zvoice
+++ b/tts/es-es/es-es-x-multi-r23.zvoice
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-r23.zvoice b/tts/fr-fr/fr-fr-x-multi-r23.zvoice
deleted file mode 100644
index ac179b5..0000000
--- a/tts/fr-fr/fr-fr-x-multi-r23.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-r24.zvoice b/tts/fr-fr/fr-fr-x-multi-r24.zvoice
new file mode 100644
index 0000000..0c89087
--- /dev/null
+++ b/tts/fr-fr/fr-fr-x-multi-r24.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-amb-r21.zvoice b/tts/it-it/it-it-x-amb-r21.zvoice
deleted file mode 100644
index 3b761b2..0000000
--- a/tts/it-it/it-it-x-amb-r21.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-amb-r22.zvoice b/tts/it-it/it-it-x-amb-r22.zvoice
new file mode 100644
index 0000000..3b9ebe1
--- /dev/null
+++ b/tts/it-it/it-it-x-amb-r22.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-ita-r21.zvoice b/tts/it-it/it-it-x-ita-r21.zvoice
deleted file mode 100644
index 780c938..0000000
--- a/tts/it-it/it-it-x-ita-r21.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-ita-r22.zvoice b/tts/it-it/it-it-x-ita-r22.zvoice
new file mode 100644
index 0000000..59a9215
--- /dev/null
+++ b/tts/it-it/it-it-x-ita-r22.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-itb-r21.zvoice b/tts/it-it/it-it-x-itb-r21.zvoice
deleted file mode 100644
index 0e5b16b..0000000
--- a/tts/it-it/it-it-x-itb-r21.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-itb-r22.zvoice b/tts/it-it/it-it-x-itb-r22.zvoice
new file mode 100644
index 0000000..576677e
--- /dev/null
+++ b/tts/it-it/it-it-x-itb-r22.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-itc-r21.zvoice b/tts/it-it/it-it-x-itc-r21.zvoice
deleted file mode 100644
index 5f4cbcc..0000000
--- a/tts/it-it/it-it-x-itc-r21.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-itc-r22.zvoice b/tts/it-it/it-it-x-itc-r22.zvoice
new file mode 100644
index 0000000..6138452
--- /dev/null
+++ b/tts/it-it/it-it-x-itc-r22.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-itd-r21.zvoice b/tts/it-it/it-it-x-itd-r21.zvoice
deleted file mode 100644
index c57cf3f..0000000
--- a/tts/it-it/it-it-x-itd-r21.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-itd-r22.zvoice b/tts/it-it/it-it-x-itd-r22.zvoice
new file mode 100644
index 0000000..3c2a55b
--- /dev/null
+++ b/tts/it-it/it-it-x-itd-r22.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-kda-r21.zvoice b/tts/it-it/it-it-x-kda-r21.zvoice
deleted file mode 100644
index 6679970..0000000
--- a/tts/it-it/it-it-x-kda-r21.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-kda-r22.zvoice b/tts/it-it/it-it-x-kda-r22.zvoice
new file mode 100644
index 0000000..f2f1ac6
--- /dev/null
+++ b/tts/it-it/it-it-x-kda-r22.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-htm-r22.zvoice b/tts/ja-jp/ja-jp-x-htm-r24.zvoice
similarity index 82%
rename from tts/ja-jp/ja-jp-x-htm-r22.zvoice
rename to tts/ja-jp/ja-jp-x-htm-r24.zvoice
index 765ceab..ebfb91b 100644
--- a/tts/ja-jp/ja-jp-x-htm-r22.zvoice
+++ b/tts/ja-jp/ja-jp-x-htm-r24.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jaa-r22.zvoice b/tts/ja-jp/ja-jp-x-jaa-r22.zvoice
deleted file mode 100644
index 82b0e85..0000000
--- a/tts/ja-jp/ja-jp-x-jaa-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jaa-r24.zvoice b/tts/ja-jp/ja-jp-x-jaa-r24.zvoice
new file mode 100644
index 0000000..bf2accc
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jaa-r24.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jab-r22.zvoice b/tts/ja-jp/ja-jp-x-jab-r22.zvoice
deleted file mode 100644
index 35f8e2e..0000000
--- a/tts/ja-jp/ja-jp-x-jab-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jab-r24.zvoice b/tts/ja-jp/ja-jp-x-jab-r24.zvoice
new file mode 100644
index 0000000..9d1ed20
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jab-r24.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jac-r22.zvoice b/tts/ja-jp/ja-jp-x-jac-r22.zvoice
deleted file mode 100644
index b10f725..0000000
--- a/tts/ja-jp/ja-jp-x-jac-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jac-r24.zvoice b/tts/ja-jp/ja-jp-x-jac-r24.zvoice
new file mode 100644
index 0000000..e445157
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jac-r24.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jad-r22.zvoice b/tts/ja-jp/ja-jp-x-jad-r22.zvoice
deleted file mode 100644
index 3cf1598..0000000
--- a/tts/ja-jp/ja-jp-x-jad-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jad-r24.zvoice b/tts/ja-jp/ja-jp-x-jad-r24.zvoice
new file mode 100644
index 0000000..be3be2a
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jad-r24.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-mfk-r22.zvoice b/tts/ja-jp/ja-jp-x-mfk-r22.zvoice
deleted file mode 100644
index 3684110..0000000
--- a/tts/ja-jp/ja-jp-x-mfk-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-mfk-r24.zvoice b/tts/ja-jp/ja-jp-x-mfk-r24.zvoice
new file mode 100644
index 0000000..e7dca7a
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-mfk-r24.zvoice
Binary files differ