diff --git a/notification-service/src/main/resources/application-dev.yml b/notification-service/src/main/resources/application-dev.yml
index 364a8a775..847d88d88 100644
--- a/notification-service/src/main/resources/application-dev.yml
+++ b/notification-service/src/main/resources/application-dev.yml
@@ -32,10 +32,6 @@ spring:
     username: postgres
     password: postgres
 
-springdoc:
-  writer-with-order-by-keys: true
-  writer-with-default-pretty-printer: true
-
 # ===================================================================
 # Application specific properties
 # Add your own application properties here, see the
diff --git a/notification-service/src/main/resources/application-local.yml b/notification-service/src/main/resources/application-local.yml
index ca23d6a65..506742b35 100644
--- a/notification-service/src/main/resources/application-local.yml
+++ b/notification-service/src/main/resources/application-local.yml
@@ -1,5 +1,5 @@
 # ===================================================================
-# Spring Boot configuration for the "dev" profile.
+# Spring Boot configuration for the "local" profile.
 #
 # This configuration overrides the application.yml file and should be
 # only used for development purpose.
@@ -42,10 +42,10 @@ spring:
     driverClassName: org.h2.Driver
     username: postgres
     password: postgres
-
-springdoc:
-  writer-with-order-by-keys: true
-  writer-with-default-pretty-printer: true
+  cloud:
+    config:
+      enabled: true
+      import: optional:configserver:http://localhost:8888
 
 # ===================================================================
 # Application specific properties
diff --git a/notification-service/src/main/resources/application.yml b/notification-service/src/main/resources/application.yml
index c7e423a6f..1e02e55dd 100644
--- a/notification-service/src/main/resources/application.yml
+++ b/notification-service/src/main/resources/application.yml
@@ -6,6 +6,9 @@ spring:
     default-property-inclusion: non_null
   main:
     lazy-initialization: true
+  cloud:
+    config:
+      enabled: false
 
 springdoc:
   writer-with-order-by-keys: true
diff --git a/workflow-service/pom.xml b/workflow-service/pom.xml
index d9eca583f..62e703457 100644
--- a/workflow-service/pom.xml
+++ b/workflow-service/pom.xml
@@ -46,6 +46,16 @@
             <artifactId>spring-cloud-starter</artifactId>
         </dependency>
         <!-- END Web Dependencies -->
+        <!-- START Spring Cloud Dependencies -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <!-- END Spring Cloud Dependencies -->
         <!-- START Spring Security Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -136,6 +146,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.modelmapper</groupId>
@@ -160,6 +176,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
diff --git a/workflow-service/src/main/resources/application-dev.yml b/workflow-service/src/main/resources/application-dev.yml
index 094e6db5e..42e56be90 100644
--- a/workflow-service/src/main/resources/application-dev.yml
+++ b/workflow-service/src/main/resources/application-dev.yml
@@ -17,6 +17,4 @@ spring:
       managerPassword: "admin"
   lifecycle:
     timeout-per-shutdown-phase: "25s"
-springdoc:
-  writer-with-order-by-keys: true
-  writer-with-default-pretty-printer: true
+
diff --git a/workflow-service/src/main/resources/application-local.yml b/workflow-service/src/main/resources/application-local.yml
index 3b953d4b6..7fc6da561 100644
--- a/workflow-service/src/main/resources/application-local.yml
+++ b/workflow-service/src/main/resources/application-local.yml
@@ -17,6 +17,19 @@ spring:
       managerPassword: null
   lifecycle:
     timeout-per-shutdown-phase: "25s"
-springdoc:
-  writer-with-order-by-keys: true
-  writer-with-default-pretty-printer: true
+  cloud:
+    config:
+      enabled: true
+      import: optional:configserver:http://localhost:8888
+
+logging:
+  level:
+    ROOT: INFO
+    com.redhat.parodos.workflow: DEBUG
+
+# ===================================================================
+# Application specific properties
+# Add your own application properties here, see the
+# ApplicationProperties class to have type-safe configuration
+# ===================================================================
+
diff --git a/workflow-service/src/main/resources/application.yml b/workflow-service/src/main/resources/application.yml
index 985c195ac..ef6bf7c36 100644
--- a/workflow-service/src/main/resources/application.yml
+++ b/workflow-service/src/main/resources/application.yml
@@ -47,6 +47,10 @@ spring:
   lifecycle:
     timeout-per-shutdown-phase: "25s"
 
+  cloud:
+    config:
+      enabled: false
+
 management:
   metrics:
     export: