Revert "Revert "update metadata structure" due to image build failure"
Revert "Revert "update metadata structure" due to image build failure"

o2r-project/o2r-meta,o2r-project/o2r-meta,o2r-project/o2r-meta,o2r-project/o2r-meta