diff --git a/spring-configuration-aggregator-maven-plugin/README.md b/spring-configuration-aggregator-maven-plugin/README.md
index 9980524..7fc543d 100644
--- a/spring-configuration-aggregator-maven-plugin/README.md
+++ b/spring-configuration-aggregator-maven-plugin/README.md
@@ -87,6 +87,7 @@ To load additional default values (not defined in annotations), configuration fi
 Supported file types are: `.properties`, `.yml` and `.yaml`.
 By default, following files are loaded:
 - `${project.baseDir}/src/main/resources/application.yml`
+- `${project.baseDir}/src/main/resources/application.yaml`
 - `${project.baseDir}/src/main/resources/application.properties`
 
 The `MetadataFile` type is a string defining a file path.
diff --git a/spring-configuration-aggregator-maven-plugin/src/main/java/com/github/egoettelmann/spring/configuration/extensions/aggregator/maven/AggregatorMojo.java b/spring-configuration-aggregator-maven-plugin/src/main/java/com/github/egoettelmann/spring/configuration/extensions/aggregator/maven/AggregatorMojo.java
index e66bb4d..53a0113 100644
--- a/spring-configuration-aggregator-maven-plugin/src/main/java/com/github/egoettelmann/spring/configuration/extensions/aggregator/maven/AggregatorMojo.java
+++ b/spring-configuration-aggregator-maven-plugin/src/main/java/com/github/egoettelmann/spring/configuration/extensions/aggregator/maven/AggregatorMojo.java
@@ -93,6 +93,7 @@ private List<PropertiesFile> getPropertiesFiles() {
         final List<PropertiesFile> files = new ArrayList<>();
         final String resourcesFolder = this.project.getBasedir() + "/src/main/resources";
         files.add(new PropertiesFile(resourcesFolder + "/application.yml"));
+        files.add(new PropertiesFile(resourcesFolder + "/application.yaml"));
         files.add(new PropertiesFile(resourcesFolder + "/application.properties"));
         return files;
     }
diff --git a/spring-configuration-extensions-samples/spring-configuration-extensions-samples1/src/main/resources/application-profile1.yml b/spring-configuration-extensions-samples/spring-configuration-extensions-samples1/src/main/resources/application-profile1.yaml
similarity index 100%
rename from spring-configuration-extensions-samples/spring-configuration-extensions-samples1/src/main/resources/application-profile1.yml
rename to spring-configuration-extensions-samples/spring-configuration-extensions-samples1/src/main/resources/application-profile1.yaml