CFY-972 updated yamls and code to fit new DSL schema