Fix push update issues on the development as well as on the staging