Revert "Revert "Continued work of adaption scripts to the new hardware""

This reverts commit d3deb3ed85a42931ef2fbc2238b8888271e37362.