My Great Grandfather’s Photo

This is my great grandfather. He was a veteran of the First World War. He started in own bakery in Czechoslovakia afterward. When WWII kicked off, he returned to Vienna and reenlisted. From what I’ve learned, the uniform he’s wearing in the second photo is for the Ordnungspolizei. Unfortunately, I cannot find any records for him during that time