diff --git a/common/build.gradle b/common/build.gradle
index 5f20d89b8..ef64ff263 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.springframework.boot:spring-boot-starter'
     compileOnly 'org.springframework.boot:spring-boot-starter-validation'
 
-    compileOnly "org.springdoc:springdoc-openapi-ui:${revOpenapi}"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
 
     implementation "org.apache.commons:commons-lang3"
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 1fbe9dad7..41c0f0317 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -43,7 +43,7 @@ ext {
     revJq = '0.0.13'
     revJsr311Api = '1.1.1'
     revMockServerClient = '5.12.0'
-    revOpenapi = '1.6.+'
+    revSpringDoc = '2.1.0'
     revOrkesQueues = '1.0.7'
     revPowerMock = '2.0.9'
     revProtoBuf = '3.21.12'
diff --git a/rest/build.gradle b/rest/build.gradle
index 97d66d816..dc19c73dd 100644
--- a/rest/build.gradle
+++ b/rest/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     implementation "com.netflix.runtime:health-api:${revHealth}"
 
-    implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
 }
diff --git a/server/build.gradle b/server/build.gradle
index 7b87576e9..38ebba808 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -42,7 +42,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation "io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}"
 
-    implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
+
 
     runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${revJAXB}"
 
diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties
index 09b8f22b4..9889a2022 100644
--- a/server/src/main/resources/application.properties
+++ b/server/src/main/resources/application.properties
@@ -15,7 +15,7 @@ spring.application.name=conductor
 springdoc.api-docs.path=/api-docs
 loadSample=true
 
-conductor.db.type=memory
+conductor.db.type=redis_standalone
 conductor.queue.type=redis_standalone
 
 conductor.indexing.enabled=false