Fix WK-371 and parameterize workflow