diff --git a/apex-setup.rc b/apex-setup.rc
new file mode 100644
index 0000000..a141cff
--- /dev/null
+++ b/apex-setup.rc
@@ -0,0 +1,10 @@
+on early-fs
+    mkdir /mnt/runtime/full 0755 root root
+    mkdir /mnt/runtime/full/self 0755 root root
+    mkdir /apex 0777 root root
+    mount tmpfs tmpfs /apex mode=0755,uid=0,gid=0
+    restorecon /apex
+    exec u:r:su:s0 -- /system/bin/apexd --bootstrap
+    export ANDROID_RUNTIME_ROOT /apex/com.android.runtime
+    export ANDROID_TZDATA_ROOT /apex/com.android.tzdata
+    symlink /system/product /product
diff --git a/base.mk b/base.mk
index b3b3994..c091a64 100644
--- a/base.mk
+++ b/base.mk
@@ -38,7 +38,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 PRODUCT_COPY_FILES += \
 	device/phh/treble/vndk-detect:system/bin/vndk-detect \
 	device/phh/treble/vndk.rc:system/etc/init/vndk.rc \
-	device/phh/treble/ld.config.26.txt:system/etc/ld.config.26.txt \
 
 #USB Audio
 PRODUCT_COPY_FILES += \
@@ -53,7 +52,7 @@ PRODUCT_COPY_FILES += \
 
 # LineageOS build may need this to make NFC work
 PRODUCT_PACKAGES += \
-        NfcNci  
+        NfcNci \
 
 PRODUCT_COPY_FILES += \
 	device/phh/treble/rw-system.sh:system/bin/rw-system.sh \
@@ -64,11 +63,11 @@ PRODUCT_COPY_FILES += \
 	device/phh/treble/phh-on-boot.sh:system/bin/phh-on-boot.sh
 
 PRODUCT_PACKAGES += \
-	treble-environ-rc
+	treble-environ-rc \
 
 PRODUCT_PACKAGES += \
 	bootctl \
-	vintf
+	vintf \
 
 # Fix Offline Charging on Huawmeme
 PRODUCT_PACKAGES += \
@@ -141,3 +140,19 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.secure_lock_screen.xml:system/etc/permissions/android.software.secure_lock_screen.xml \
 
+PRODUCT_COPY_FILES += \
+	device/phh/treble/apex-setup.rc:system/etc/init/apex-setup.rc \
+
+PRODUCT_COPY_FILES += \
+        device/phh/treble/ld.config.26.txt:system/etc/ld.config.26.txt \
+
+PRODUCT_COPY_FILES += \
+	system/core/rootdir/init.zygote32.rc:system/etc/init/zygote/init.zygote32.rc \
+	system/core/rootdir/init.zygote32_64.rc:system/etc/init/zygote/init.zygote32_64.rc \
+	system/core/rootdir/init.zygote64_32.rc:system/etc/init/zygote/init.zygote64_32.rc \
+	system/core/rootdir/init.zygote64.rc:system/etc/init/zygote/init.zygote64.rc \
+
+PRODUCT_COPY_FILES += \
+	frameworks/av/apex/mediaswcodec.rc:system/etc/init/mediaswcodec-treble.rc \
+	device/phh/treble/environ/init.treble-environ.rc:system/etc/init/init.treble-environ.rc \
+