Revert "Merge branch 'infra_bundle_server' into 'master'"

This reverts merge request !613 (merged) The Pipeline is failing after the changes due to incorrect role assignment