diff --git a/src/main/resources/application-mysql.properties b/src/main/resources/application-mysql.properties
deleted file mode 100644
index d388c9e6d..000000000
--- a/src/main/resources/application-mysql.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# database init, supports mysql too
-database=mysql
-spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost/petclinic}
-spring.datasource.username=${MYSQL_USER:petclinic}
-spring.datasource.password=${MYSQL_PASS:petclinic}
-# SQL is written to be idempotent so this is safe
-spring.datasource.initialization-mode=always
diff --git a/src/main/resources/application-mysql.yml b/src/main/resources/application-mysql.yml
new file mode 100644
index 000000000..fa08006a8
--- /dev/null
+++ b/src/main/resources/application-mysql.yml
@@ -0,0 +1,8 @@
+# database init, supports mysql too
+database: mysql
+spring.datasource.url: ${MYSQL_URL:jdbc:mysql://localhost/petclinic}
+spring.datasource.username: ${MYSQL_USER:petclinic}
+spring.datasource.password: ${MYSQL_PASS:petclinic}
+
+# SQL is written to be idempotent so this is safe
+spring.datasource.initialization-mode: always
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 4d4784e36..000000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# database init, supports mysql too
-database=h2
-spring.datasource.schema=classpath*:db/${database}/schema.sql
-spring.datasource.data=classpath*:db/${database}/data.sql
-
-# Web
-spring.thymeleaf.mode=HTML
-
-# JPA
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.open-in-view=false
-
-# Internationalization
-spring.messages.basename=messages/messages
-
-# Actuator
-management.endpoints.web.exposure.include=*
-
-# Logging
-logging.level.org.springframework=INFO
-# logging.level.org.springframework.web=DEBUG
-# logging.level.org.springframework.context.annotation=TRACE
-
-# Maximum time static resources should be cached
-spring.resources.cache.cachecontrol.max-age=12h
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 000000000..be804faed
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,24 @@
+# database init, supports mysql too
+database: h2
+spring:
+  datasource:
+    schema: classpath*:db/${database}/schema.sql
+    data: classpath*:db/${database}/data.sql
+  jpa:
+    hibernate.ddl-auto: none
+    open-in-view: false
+spring.thymeleaf.mode: HTML
+
+# Internationalization
+spring.messages.basename: messages/messages
+
+# Actuator
+management.endpoints.web.exposure.include: '*'
+
+# Logging
+logging.level.org.springframework: INFO
+# logging.level.org.springframework.web=DEBUG
+# logging.level.org.springframework.context.annotation=TRACE
+
+# Maximum time static resources should be cached
+spring.resources.cache.cachecontrol.max-age: 12h