Hi, yes there is a bike shop on Salwa Rd, it's 2 or 3 RAB's on the left west of Decoration RAB called bike shack. It's probably the best in Qatar.

Good luck.