diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index b7d62b31dcee2422e09666cea842a1891c854a15..dc0677952cb77744c1c2e88bb8e6b817182d47dc 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -14,9 +14,12 @@
         <assertj-core.version>3.11.1</assertj-core.version>
         <jackson.version>2.10.0</jackson.version>
         <lombok.version>1.18.10</lombok.version>
+        <micrometer.version>1.3.0</micrometer.version>
         <mockito.version>1.10.19</mockito.version>
         <spring.boot.version>2.2.0.RELEASE</spring.boot.version>
         <spring.security.version>5.2.0.RELEASE</spring.security.version>
+        <spring.version>5.2.0.RELEASE</spring.version>
+        <spring.security.version>5.2.0.RELEASE</spring.security.version>
         <spring.test.version>5.2.0.RELEASE</spring.test.version>
         <swagger.version>1.5.18</swagger.version>
         <thymeleaf-spring5.version>3.0.11.RELEASE</thymeleaf-spring5.version>
@@ -58,6 +61,12 @@
             <groupId>org.apereo.cas</groupId>
             <artifactId>cas-server-support-pac4j-webflow</artifactId>
             <version>${cas.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.dropwizard.metrics</groupId>
+                    <artifactId>metrics-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apereo.cas</groupId>
@@ -259,20 +268,16 @@
         </dependency>
 
         <!-- metrics -->
-		<!-- <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.apereo.cas</groupId>
+            <artifactId>cas-server-support-metrics</artifactId>
+            <version>${cas.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
             <version>${micrometer.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apereo.cas</groupId>
-            <artifactId>cas-server-support-metrics</artifactId>
-            <version>${cas.version}</version>
-        </dependency> -->
 
         <!-- logs -->
         <dependency>
@@ -400,6 +405,9 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <mainClass>org.apereo.cas.web.CasWebApplication</mainClass>
+					<arguments>
+						<argument>--spring.config.additional-location=file:${basedir}/src/main/config/cas-server-application-dev.yml</argument>
+					</arguments>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/cas/cas-server/run.sh b/cas/cas-server/run.sh
index 526010ec1401a2969adc03123f7bb5a25116750d..880a9cd8128000463cbae05b5ff2405031e86fd2 100755
--- a/cas/cas-server/run.sh
+++ b/cas/cas-server/run.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 mvn clean package -DskipTests
-mkdir -p target/src/main
-rm -rf target/src/main/config
-cp -r src/main/config target/src/main/config
-java -Dspring.config.location=src/main/config/cas-server-application-dev.yml -jar -Xms128m -Xmx512m target/cas-server.war
+java -Dspring.config.additional-location=src/main/config/cas-server-application-dev.yml -jar -Xms128m -Xmx512m target/cas-server.war
diff --git a/cas/cas-server/run_recette.sh b/cas/cas-server/run_recette.sh
index c000d403c5bfa1024164fa51dabd5320727c91d6..8592cf9588cc067417f224cd026ee56e6dc398ac 100755
--- a/cas/cas-server/run_recette.sh
+++ b/cas/cas-server/run_recette.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 mvn clean package -DskipTests
-mkdir -p target/src/main
-rm -rf target/src/main/config
-cp -r src/main/config target/src/main/config
-java -Dspring.config.location=src/main/config/cas-server-application-recette.yml -jar -Xms128m -Xmx512m target/cas-server.war
+java -Dspring.config.additional-location=src/main/config/cas-server-application-recette.yml -jar -Xms128m -Xmx512m target/cas-server.war
diff --git a/cas/cas-server/src/main/config/cas-server-application-recette.yml b/cas/cas-server/src/main/config/cas-server-application-recette.yml
index 59ebda7cdbbe3f0c344a92bf9cb491c263a24d2f..ad1f70fdd45c81a4e8280c93d6c77ab0bf180300 100644
--- a/cas/cas-server/src/main/config/cas-server-application-recette.yml
+++ b/cas/cas-server/src/main/config/cas-server-application-recette.yml
@@ -20,7 +20,7 @@ server:
     context-path: /cas
 
 
-vitamui.cas.tenant.identifier: 4
+vitamui.cas.tenant.identifier: 11
 vitamui.cas.identity: cas
 iam-client:
   server-host: localhost
diff --git a/cas/cas-server/src/main/resources/application.properties b/cas/cas-server/src/main/resources/application.properties
index f4ac54d8b4837e077404ea4189b0b2e281c4da47..e33485f7dba1d2a1591830706dd8f31566aadb80 100644
--- a/cas/cas-server/src/main/resources/application.properties
+++ b/cas/cas-server/src/main/resources/application.properties
@@ -85,6 +85,12 @@ management.endpoints.web.base-path=/actuator
 
 management.endpoints.web.exposure.include=info,health,status,configurationMetadata
 management.endpoints.jmx.exposure.exclude=*
+management.metrics.export.atlas.enabled=false
+management.metrics.export.graphite.enabled=false
+management.metrics.export.influx.enabled=false
+management.metrics.export.newrelic.enabled=false
+management.metrics.export.signalfx.enabled=false
+management.metrics.export.wavefront.enabled=false
 
 # management.endpoints.web.exposure.include=*
 # management.endpoints.web.path-mapping.health=status