Revert "Merge branch 'feat/upgrade36x' into 'main'"

This reverts merge request !16 (merged)

Revert to waiting 36.2 release and to pass monitoring blackbox exporter