Remove use of deprecated method and use the one in CF #652

Job	Run time
build (cfi-tests, 8)	8m 57s
build (cfi-tests, 11)	9m 18s
build (cfi-tests, 17)	8m 39s
build (downstream-ontology, 8)	9m 1s
build (downstream-ontology, 11)	10m 33s
build (downstream-ontology, 17)	10m 9s
build (downstream-security-demo, 8)	8m 55s
build (downstream-security-demo, 11)	9m 31s
build (downstream-security-demo, 17)	9m 22s
build (downstream-universe, 8)	6m 8s
build (downstream-universe, 11)	6m 37s
build (downstream-universe, 17)	6m 54s
	1h 44m 4s

Provide feedback