fix 3
fix 2
fix
client image builds
remove old builder dockerfile, move new ones into folder
better CI image
CI caching