Improving mordor specific packages