diff --git a/.drone.yml b/.drone.yml
index 1b3f190..19df81b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,69 +1,106 @@
----
 kind: pipeline
-type: exec
+type: docker
 name: mondrianwifi
 
-platform:
-  os: linux
-  arch: amd64
+environment:
+  device: mondrianwifi
+  version: 19.1
 
 steps:
 - name: sync
+  pull: always
+  image: docker.nyyu.dev/lineage/android:latest
   commands:
-  - source $DRONE_HOME/${DRONE_STAGE_NAME}.env
-  - cd $work
-  - repo init -u https://github.com/LineageOS/android.git -b lineage-$version
+  - cd /build
+  - rm -rf .repo/repo
+  - repo init -u https://github.com/LineageOS-UL/android.git -b lineage-$version
   - mkdir -p .repo/local_manifests
-  - cp $DRONE_HOME/$device.xml .repo/local_manifests/roomservice.xml
+  - cp $DRONE_WORKSPACE_BASE/$device.xml .repo/local_manifests/roomservice.xml
   - repo sync -q -c -j 6 --fail-fast --force-sync --no-tags
-
+  volumes:
+  - name: build
+    path: /build
 - name: build
-  shell: /bin/bash
+  pull: always
+  image: docker.nyyu.dev/lineage/android:latest
   commands:
-  - source $DRONE_HOME/${DRONE_STAGE_NAME}.env
-  - cd $work
-  - . build/envsetup.sh
-  - lunch lineage_$device-userdebug
-  - mka bacon -j6
-
+  - cd /build
+  - bash -c ". build/envsetup.sh && lunch lineage_$device-userdebug && mka bacon -j6"
+  volumes:
+  - name: build
+    path: /build
 - name: copy
+  pull: always
+  image: docker.nyyu.dev/lineage/android:latest
   commands:
-  - source $DRONE_HOME/${DRONE_STAGE_NAME}.env
-  - cd $work
-  - rm -f $httpdir/lineage-$version-*-UNOFFICIAL-$device.zip{,.sha256sum}
-  - mv -f out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip{,.sha256sum} $httpdir/
-  - ls -lh $httpdir/lineage-$version-*-UNOFFICIAL-$device.zip{,.sha256sum}
-
+  - rm -f /http/lineage-$version-*-UNOFFICIAL-$device.zip*
+  - mv -f /build/out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip* /http/
+  - ls -lh /http/lineage-$version-*-UNOFFICIAL-$device.zip*
+  volumes:
+  - name: build
+    path: /build
+  - name: http
+    path: /http
 - name: clean
+  pull: always
+  image: docker.nyyu.dev/lineage/android:latest
   commands:
-  - source $DRONE_HOME/${DRONE_STAGE_NAME}.env
-  - cd $work
+  - cd /build
   - rm -f out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip_* out/target/product/$device/lineage_$device-ota-eng.*.zip
-
+  volumes:
+  - name: build
+    path: /build
 trigger:
   event:
-  - push
   - custom
   - cron
 
----
+volumes:
+- name: http
+  host:
+    path: /srv/http/drone
+- name: build
+  host:
+    path: /media/fast/lineage/lineage-19.1
+- name: publish
+  host:
+    path: /mnt/android/lineage
 
-kind: pipeline      
-type: exec          
+image_pull_secrets:
+- dockerconfig
+---
+kind: pipeline
+type: docker
 name: mondrianwifi-publish
 
-platform:
-  os: linux
-  arch: amd64
+environment:
+  device: mondrianwifi
+  version: 19.1
 
 steps:
 - name: publish
+  pull: always
+  image: docker.nyyu.dev/lineage/android:latest
   commands:
-  - source $DRONE_HOME/mondrianwifi.env
-  - cd $httpdir
-  - mv lineage-$version-*-UNOFFICIAL-$device.zip{,.sha256sum} $publishdir/
-  - ls -lh $publishdir/
-
+  - cd /http
+  - mv lineage-$version-*-UNOFFICIAL-$device.zip* /publish/$version/$device/
+  - ls -lh /publish/$version/$device/
+  volumes:
+  - name: http
+    path: /http
+  - name: publish
+    path: /publish
 trigger:
   event:
   - promote
+
+volumes:
+- name: http
+  host:
+    path: /srv/http/drone
+- name: publish
+  host:
+    path: /mnt/android/lineage
+
+image_pull_secrets:
+- dockerconfig
diff --git a/mondrianlte.env b/mondrianlte.env
deleted file mode 100644
index 07afe48..0000000
--- a/mondrianlte.env
+++ /dev/null
@@ -1,5 +0,0 @@
-version=18.1
-work=/drone/lineage-$version
-device=mondrianlte
-httpdir=/srv/http/drone
-publishdir=/mnt/android/lineage/$version/$device
diff --git a/mondrianlte.xml b/mondrianlte.xml
deleted file mode 100644
index 69e14db..0000000
--- a/mondrianlte.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote name="nyyu" fetch="https://git.nyyu.dev" />
-
-  <project name="lineage/android_device_samsung_mondrianlte" path="device/samsung/mondrianlte" remote="nyyu" />
-  <project name="lineage/android_device_samsung_mondrianwifi" path="device/samsung/mondrianwifi" remote="nyyu" />
-  <project name="lineage/android_kernel_samsung_msm8974" path="kernel/samsung/msm8974_tab" remote="nyyu" revision="lineage-18.1_pro" />
-  <project name="lineage/android_vendor_samsung_mondrianlte" path="vendor/samsung/mondrianlte" remote="nyyu" />
-  <project name="lineage/android_vendor_samsung_mondrianwifi" path="vendor/samsung/mondrianwifi" remote="nyyu" />
-  <project name="LineageOS/android_device_samsung_msm8974-common" path="device/samsung/msm8974-common" remote="github" />
-  <project name="LineageOS/android_device_samsung_qcom-common" path="device/samsung/qcom-common" remote="github" />
-  <project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" />
-  <project name="LineageOS/android_hardware_sony_timekeep" path="hardware/sony/timekeep" remote="github" />
-  <project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" remote="github" />
-
-  <remove-project name="platform/prebuilts/clang/host/darwin-x86" />
-  <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
-  <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />
-  <remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />
-  <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_x86_x86_64-linux-android-4.9" />
-  <remove-project name="platform/prebuilts/gdb/darwin-x86" />
-  <remove-project name="platform/prebuilts/go/darwin-x86" />
-  <remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
-</manifest>
diff --git a/mondrianwifi.env b/mondrianwifi.env
deleted file mode 100644
index cc0db4d..0000000
--- a/mondrianwifi.env
+++ /dev/null
@@ -1,5 +0,0 @@
-version=18.1
-work=/drone/lineage-$version
-device=mondrianwifi
-httpdir=/srv/http/drone
-publishdir=/mnt/android/lineage/$version/$device
diff --git a/mondrianwifi.xml b/mondrianwifi.xml
index c5bc1a6..a18b886 100644
--- a/mondrianwifi.xml
+++ b/mondrianwifi.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <remote name="nyyu" fetch="https://git.nyyu.dev" />
-
   <project name="lineage/android_device_samsung_mondrianwifi" path="device/samsung/mondrianwifi" remote="nyyu" />
-  <project name="lineage/android_kernel_samsung_msm8974" path="kernel/samsung/msm8974_tab" remote="nyyu" revision="lineage-18.1_pro" />
+  <project name="lineage/android_kernel_samsung_msm8974" path="kernel/samsung/msm8974_tab" remote="nyyu" revision="lineage-19.1_pro" />
   <project name="lineage/android_vendor_samsung_mondrianwifi" path="vendor/samsung/mondrianwifi" remote="nyyu" />
-  <project name="LineageOS/android_device_samsung_msm8974-common" path="device/samsung/msm8974-common" remote="github" />
+  <project name="lineage/android_device_samsung_msm8974-common" path="device/samsung/msm8974-common" remote="nyyu" />
   <project name="LineageOS/android_device_samsung_qcom-common" path="device/samsung/qcom-common" remote="github" />
   <project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" />
-  <project name="LineageOS/android_hardware_sony_timekeep" path="hardware/sony/timekeep" remote="github" />
-  <project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" remote="github" />
+  <project name="LineageOS/android_hardware_sony_timekeep" path="hardware/sony/timekeep" remote="github" revision="lineage-18.1" />
+  <project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-18.1" />
 
   <remove-project name="platform/prebuilts/clang/host/darwin-x86" />
   <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />