attempt to include ci-context in PCIs as amd
refactoring : ci-context as amd