Simplified and used other dockerfile