Merge "Fix CDS docker job"