Make Dockerfile and Makefile less version-dependent