diff --git a/Versioning.md b/Versioning.md
index 00835c677..a51dad257 100644
--- a/Versioning.md
+++ b/Versioning.md
@@ -28,5 +28,4 @@ Examples of version:
 * `2.0.0` - Major GA release of 2.0.0 line
 * `2.0.1` - Patch release of 2.0.x line
 * `2.1.0` - First minor feature release of 2.x line 
-
-
+* `2.0.0-BETA` - Pre-release version
\ No newline at end of file
diff --git a/backend/build.gradle b/backend/build.gradle
index 71575911a..e2e080dbc 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -129,7 +129,7 @@ bootWar {
     }
     dependsOn 'copyApplicationYAML'
     archiveName = "${baseName}-${version}.war"
-    duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
 springBoot {
@@ -363,7 +363,7 @@ task enversTest(type: Test) {
     classpath = sourceSets.enversTest.runtimeClasspath
     systemProperties = System.properties
     systemProperties['user.dir'] = workingDir
-    processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+    processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     useJUnitPlatform()
 }
 
@@ -486,7 +486,7 @@ docker {
     files tasks.bootWar.outputs
     files 'src/main/docker-files/loader.properties'
     buildArgs(['JAR_FILE': "shibui-${version}.war"])
-    copySpec.duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+    copySpec.duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
 tasks.dockerRun.dependsOn tasks.docker
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy
index 7f0f16606..1b03ee6f8 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy
@@ -150,7 +150,7 @@ class EntitiesControllerTests extends AbstractBaseDataJpaTest {
 </md:EntityDescriptor>
 '''
         when:
-        def result = mockMvc.perform(get('/api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1').header('Accept', 'application/xml'))
+        def result = mockMvc.perform(get('/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1').header('Accept', 'application/xml'))
 
         then:
         result.andExpect(status().isOk())
diff --git a/gradle.properties b/gradle.properties
index 6c6217cee..ac75875b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=2.0.0-BETA
+version=2.0.0-BETA-R2
 
 ### library versions ###
 ## As of 2-23-23
@@ -42,7 +42,7 @@ i2.github.owner=TIER
 i2.github.repo=shib-idp-ui
 i2.github.apiEndpoint=https://github.internet2.edu/api/v3
 i2.git.remote=i2
-i2.git.branch=2.0.0-BETA
+i2.git.branch=master
 
 # set app
 use.release.app.yml=false