Simplified yml and created Docker