Combine both production CI systems (#234)