BATCH-2028: Updated repository and fixed URLs