diff --git a/pom.xml b/pom.xml
index 10043060685..aec9b80a0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.cbioportal</groupId>
 	<artifactId>cbioportal</artifactId>
-	<version>6.0.8-SNAPSHOT</version>
+	<version>6.0.9-SNAPSHOT</version>
 
 	<description>cBioPortal for Cancer Genomics</description>
 
@@ -27,7 +27,7 @@
 		<!--        TODO replace with version of cbioportal frontend with compatible
         login url-->
 		<frontend.groupId>com.github.cbioportal</frontend.groupId>
-		<frontend.version>v6.0.7</frontend.version>
+		<frontend.version>v6.0.8</frontend.version>
 
         <!-- THIS SHOULD BE KEPT IN SYNC TO VERSION IN CGDS.SQL -->
 		<db.version>2.13.1</db.version>
diff --git a/src/main/java/org/cbioportal/PortalApplication.java b/src/main/java/org/cbioportal/PortalApplication.java
index 97844cb926b..c64043a1dbc 100644
--- a/src/main/java/org/cbioportal/PortalApplication.java
+++ b/src/main/java/org/cbioportal/PortalApplication.java
@@ -15,7 +15,8 @@
     @PropertySource(ignoreResourceNotFound = true, value = "classpath:application.properties"),
     @PropertySource(ignoreResourceNotFound = true, value = "classpath:security.properties"),
     @PropertySource(ignoreResourceNotFound = true, value = "classpath:maven.properties"),
-    @PropertySource(ignoreResourceNotFound = true, value = "classpath:git.properties")
+    @PropertySource(ignoreResourceNotFound = true, value = "classpath:git.properties"),
+    @PropertySource(ignoreResourceNotFound = true, value = "classpath:springdoc.properties")
 })
 public class PortalApplication {
     public static void main(String[] args) {
diff --git a/src/main/resources/springdoc.properties b/src/main/resources/springdoc.properties
new file mode 100644
index 00000000000..06be7e0a8fe
--- /dev/null
+++ b/src/main/resources/springdoc.properties
@@ -0,0 +1,4 @@
+springdoc.swagger-ui.urlsPrimaryName=public
+springdoc.swagger-ui.disable-swagger-default-url=true
+springdoc.swagger-ui.path=/api/swagger-ui
+springdoc.api-docs.path=/api/v3/api-docs
diff --git a/src/main/resources/springfox.properties b/src/main/resources/springfox.properties
deleted file mode 100644
index 99ebf4d7c55..00000000000
--- a/src/main/resources/springfox.properties
+++ /dev/null
@@ -1 +0,0 @@
-springfox.documentation.swagger.v2.path=/api-docs