updated makefiles for golden image build