You can also refer to [Jetson Orin Nano] [OTA] [35.5.0][36.3] Failed to boot after OTA upgrade from 35.5.0 to 36.3 - #12 by KevinFFF to apply those 3 changes.
Since you are using the devkit, we would suggest you simply updating to the latest JP6.1 release.