Removing hardcoding on server and apps