Fix rhel8 image build

Merged Mohammed Ismail requested to merge fix-rhel8-image-build into develop

Merge request reports