diff --git a/swabbie-web/src/main/kotlin/com/netflix/spinnaker/swabbie/Main.kt b/swabbie-web/src/main/kotlin/com/netflix/spinnaker/swabbie/Main.kt
index 5329a4a8..d3b4f804 100644
--- a/swabbie-web/src/main/kotlin/com/netflix/spinnaker/swabbie/Main.kt
+++ b/swabbie-web/src/main/kotlin/com/netflix/spinnaker/swabbie/Main.kt
@@ -25,17 +25,12 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
+import com.netflix.spinnaker.kork.boot.DefaultPropertiesBuilder
 
 object MainDefaults {
-  val PROPS = mapOf(
-    "netflix.environment" to "test",
-    "netflix.account" to "\${netflix.environment}",
-    "netflix.stack" to "test",
-    "spring.config.location" to "\${user.home}/.spinnaker/",
-    "spring.application.name" to "swabbie",
-    "spring.config.name" to "spinnaker,\${spring.application.name}",
-    "spring.profiles.active" to "\${netflix.environment},local"
-  )
+  val PROPS = DefaultPropertiesBuilder().property("spring.application.name", "swabbie")
+    .property("spring.mvc.pathmatch.matching-strategy","ANT_PATH_MATCHER")
+    .build()
 }
 
 @Configuration
diff --git a/swabbie-web/swabbie-web.gradle b/swabbie-web/swabbie-web.gradle
index 896fa0f6..4f8653cd 100644
--- a/swabbie-web/swabbie-web.gradle
+++ b/swabbie-web/swabbie-web.gradle
@@ -31,6 +31,8 @@ dependencies {
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "org.springframework.boot:spring-boot-starter-data-rest"
   implementation "io.spinnaker.kork:kork-web"
+  implementation "io.spinnaker.kork:kork-config"
+
   implementation project(":swabbie-aws")
   implementation project(":swabbie-clouddriver")
   implementation project(":swabbie-core")