diff --git a/fixup-mountpoints b/fixup-mountpoints
index 18a1484..8c0d065 100755
--- a/fixup-mountpoints
+++ b/fixup-mountpoints
@@ -1910,6 +1910,95 @@ case "$DEVICE" in
             -e 's block/platform/soc/1da4000.ufshc/by-name/xbl_b sdc1 ' \
             "$@"
         ;;
+
+    "dipper")
+        sed -i \
+	    -e 's block/bootdevice/by-name/ImageFv sdf4 ' \
+	    -e 's block/bootdevice/by-name/abl_a sde32 ' \
+	    -e 's block/bootdevice/by-name/abl_b sde33 ' \
+	    -e 's block/bootdevice/by-name/aop_a sde14 ' \
+	    -e 's block/bootdevice/by-name/aop_b sde15 ' \
+	    -e 's block/bootdevice/by-name/apdp sde6 ' \
+	    -e 's block/bootdevice/by-name/bk01 sda3 ' \
+	    -e 's block/bootdevice/by-name/bk02 sda4 ' \
+	    -e 's block/bootdevice/by-name/bk03 sda5 ' \
+	    -e 's block/bootdevice/by-name/bk04 sda8 ' \
+	    -e 's block/bootdevice/by-name/bk05 sda13 ' \
+	    -e 's block/bootdevice/by-name/bk31 sdd1 ' \
+	    -e 's block/bootdevice/by-name/bk32 sdd3 ' \
+            -e 's block/bootdevice/by-name/bk33 sdd5 ' \
+            -e 's block/bootdevice/by-name/bk41 sde3 ' \
+            -e 's block/bootdevice/by-name/bk42 sde9 ' \
+            -e 's block/bootdevice/by-name/bk43 sde16 ' \
+            -e 's block/bootdevice/by-name/bk44 sde17 ' \
+            -e 's block/bootdevice/by-name/bk45 sde25 ' \
+            -e 's block/bootdevice/by-name/bk46 sde29 ' \
+            -e 's block/bootdevice/by-name/bk47 sde38 ' \
+            -e 's block/bootdevice/by-name/bk48 sde40 ' \
+            -e 's block/bootdevice/by-name/bk49 sde41 ' \
+            -e 's block/bootdevice/by-name/bk51 sdf2 ' \
+            -e 's block/bootdevice/by-name/bk52 sdf3 ' \
+            -e 's block/bootdevice/by-name/bk53 sdf5 ' \
+            -e 's block/bootdevice/by-name/bluetooth sde24 ' \
+            -e 's block/bootdevice/by-name/boot sde45 ' \
+            -e 's block/bootdevice/by-name/cache sda20 ' \
+            -e 's block/bootdevice/by-name/cdt sdd2 ' \
+            -e 's block/bootdevice/by-name/cmnlib64_a sde20 ' \
+            -e 's block/bootdevice/by-name/cmnlib64_b sde21 ' \
+            -e 's block/bootdevice/by-name/cmnlib_a sde18 ' \
+            -e 's block/bootdevice/by-name/cmnlib_b sde19 ' \
+            -e 's block/bootdevice/by-name/cust sda18 ' \
+            -e 's block/bootdevice/by-name/ddr sdd4 ' \
+            -e 's block/bootdevice/by-name/devcfg_a sde12 ' \
+            -e 's block/bootdevice/by-name/devcfg_b sde13 ' \
+            -e 's block/bootdevice/by-name/devinfo sda12 ' \
+            -e 's block/bootdevice/by-name/dip sde28 ' \
+            -e 's block/bootdevice/by-name/dsp sde44 ' \
+            -e 's block/bootdevice/by-name/dtbo sde37 ' \
+            -e 's block/bootdevice/by-name/frp sda7 ' \
+            -e 's block/bootdevice/by-name/fsc sdf1 ' \
+            -e 's block/bootdevice/by-name/fsg sde36 ' \
+            -e 's block/bootdevice/by-name/hyp_a sde26 ' \
+            -e 's block/bootdevice/by-name/hyp_b sde27 ' \
+            -e 's block/bootdevice/by-name/keymaster_a sde22 ' \
+            -e 's block/bootdevice/by-name/keymaster_b sde23 ' \
+            -e 's block/bootdevice/by-name/keystore sda6 ' \
+            -e 's block/bootdevice/by-name/limits sde2 ' \
+            -e 's block/bootdevice/by-name/logdump sda16 ' \
+            -e 's block/bootdevice/by-name/logfs sda10 ' \
+            -e 's block/bootdevice/by-name/logo sde43 ' \
+            -e 's block/bootdevice/by-name/minidump sda17 ' \
+            -e 's block/bootdevice/by-name/misc sda9 ' \
+            -e 's block/bootdevice/by-name/modem sde46 ' \
+            -e 's block/bootdevice/by-name/modemst1 sdf6 ' \
+            -e 's block/bootdevice/by-name/modemst2 sdf7 ' \
+            -e 's block/bootdevice/by-name/msadp sde7 ' \
+            -e 's block/bootdevice/by-name/oops sda11 ' \
+            -e 's block/bootdevice/by-name/persist sda14 ' \
+            -e 's block/bootdevice/by-name/persistbak sda15 ' \
+            -e 's block/bootdevice/by-name/qupfw_a sde4 ' \
+            -e 's block/bootdevice/by-name/qupfw_b sde5 ' \
+            -e 's block/bootdevice/by-name/recovery sda19 ' \
+            -e 's block/bootdevice/by-name/sec sde1 ' \
+            -e 's block/bootdevice/by-name/splash sde42 ' \
+            -e 's block/bootdevice/by-name/spunvm sde39 ' \
+            -e 's block/bootdevice/by-name/ssd sda2 ' \
+            -e 's block/bootdevice/by-name/sti sde30 ' \
+            -e 's block/bootdevice/by-name/storsec_a sde10 ' \
+            -e 's block/bootdevice/by-name/storsec_b sde11 ' \
+            -e 's block/bootdevice/by-name/switch sda1 ' \
+            -e 's block/bootdevice/by-name/system sde48 ' \
+            -e 's block/bootdevice/by-name/toolsfv sde31 ' \
+            -e 's block/bootdevice/by-name/tz_a sde34 ' \
+            -e 's block/bootdevice/by-name/tz_b sde35 ' \
+            -e 's block/bootdevice/by-name/userdata sda21 ' \
+            -e 's block/bootdevice/by-name/vbmeta sde8 ' \
+            -e 's block/bootdevice/by-name/vendor sde47 ' \
+            -e 's block/bootdevice/by-name/xbl_a sdb2 ' \
+            -e 's block/bootdevice/by-name/xbl_b sdc2 ' \
+            -e 's block/bootdevice/by-name/xbl_config_a sdb1 ' \
+            -e 's block/bootdevice/by-name/xbl_config_b sdc1 ' "$@"
+	;;
     *)
         cat <<EOF