Cleaning up versioning in CI/CD and Docker