CE-3067: Standardise ci 2
Following a first attempt at !14 (closed), I have merged in the changes previously made to the main branch before making these changes. The only custom configuration that remains at the moment is the deployment to test-02, which we can separately investigate keeping.