Adding configurations and fixes for somewhat proper deployment