diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7fb9ba9..325cf3c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -15,8 +15,8 @@ BUILD_BROKEN_DUP_RULES := true
 TARGET_SCREEN_DENSITY := 440
 
 # Init
-TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_apollon
-TARGET_RECOVERY_DEVICE_MODULES := libinit_apollon
+TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_apollon
+TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_apollon
 
 # Kernel
 TARGET_KERNEL_CONFIG := vendor/apollo_defconfig
diff --git a/libinit/Android.bp b/libinit/Android.bp
index 6a9a68f..4ffce1f 100644
--- a/libinit/Android.bp
+++ b/libinit/Android.bp
@@ -5,8 +5,9 @@
 //
 
 cc_library_static {
-    name: "libinit_apollon",
-    defaults: ["//device/xiaomi/sm8250-common:libinit_kona_defaults"],
-    srcs: ["init_apollon.cpp"],
-    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_kona"],
+    name: "init_xiaomi_apollon",
+    srcs: ["init_xiaomi_apollon.cpp"],
+    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"],
+    include_dirs: ["system/core/init"],
+    recovery_available: true,
 }
diff --git a/libinit/init_apollon.cpp b/libinit/init_xiaomi_apollon.cpp
similarity index 81%
rename from libinit/init_apollon.cpp
rename to libinit/init_xiaomi_apollon.cpp
index 77727b3..76d227c 100644
--- a/libinit/init_apollon.cpp
+++ b/libinit/init_xiaomi_apollon.cpp
@@ -4,7 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <libinit_kona.h>
+#include <libinit_dalvik_heap.h>
+#include <libinit_variant.h>
+
+#include "vendor_init.h"
 
 static const variant_info_t apollocn_info = {
     .hwc_value = "CN",
@@ -14,7 +17,6 @@ static const variant_info_t apollocn_info = {
     .device = "apollo",
     .marketname = "K30S Ultra",
     .model = "M2007J3SC",
-    .build_description = "apollo-user 11 RKQ1.200826.002 V12.5.1.0.RJDCNXM release-keys",
     .build_fingerprint = "Redmi/apollo/apollo:11/RKQ1.200826.002/V12.5.1.0.RJDCNXM:user/release-keys",
 
     .nfc = true,
@@ -28,7 +30,6 @@ static const variant_info_t apollo_info = {
     .device = "apollo",
     .marketname = "Mi 10T",
     .model = "M2007J3SY",
-    .build_description = "apollo-user 11 RKQ1.200826.002 V12.5.1.0.RJDMIXM release-keys",
     .build_fingerprint = "Xiaomi/apollo_global/apollo:11/RKQ1.200826.002/V12.5.1.0.RJDMIXM:user/release-keys",
 
     .nfc = true,
@@ -42,7 +43,6 @@ static const variant_info_t apollopro_info = {
     .device = "apollo",
     .marketname = "Mi 10T Pro",
     .model = "M2007J3SG",
-    .build_description = "apollopro-user 11 RKQ1.200826.002 V12.5.1.0.RJDMIXM release-keys",
     .build_fingerprint = "Xiaomi/apollopro_global/apollopro:11/RKQ1.200826.002/V12.5.1.0.RJDMIXM:user/release-keys",
 
     .nfc = true,