Cleanup Gitlab CI and Dockerfiles (!1796)