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

Job	Run time
build (cfi-tests, 8)	8m 54s
build (cfi-tests, 11)	9m 16s
build (cfi-tests, 17)	9m 9s
build (downstream-ontology, 8)	9m 27s
build (downstream-ontology, 11)	10m 47s
build (downstream-ontology, 17)	9m 45s
build (downstream-security-demo, 8)	9m 21s
build (downstream-security-demo, 11)	9m 48s
build (downstream-security-demo, 17)	9m 27s
build (downstream-universe, 8)	5m 38s
build (downstream-universe, 11)	6m 53s
build (downstream-universe, 17)	7m 5s
	1h 45m 30s

Provide feedback