I suggest you contact the Hajj and Umrah travel agents in Doha. From what I know, yes you can but after Umrah you may not be able to return to Doha but will need to fly home from there. However, I am not very sure of this and you can check with the immigration people for further clarifications.