I am 99% sure both are West Germanicon. I have never known the NVA to carry can type. Maybe right after WW2 but they had the pouches pretty quick.

Later the West Germans (don't know when exactly) changed over to pouches as well.

As to the canteen I think the same type was also used by BGS later on, maybe as late as the 1980's.