Clean up and circumvent the merge from GenerateWorkflow, as this is shitty and not loading.
GenerateWorkflow
mentioned in commit bec05c31
merged