diff --git a/sources/yaml/src/main/java/io/smallrye/config/source/yaml/YamlConfigSource.java b/sources/yaml/src/main/java/io/smallrye/config/source/yaml/YamlConfigSource.java
index c5ab4a6e2..beaf47a58 100644
--- a/sources/yaml/src/main/java/io/smallrye/config/source/yaml/YamlConfigSource.java
+++ b/sources/yaml/src/main/java/io/smallrye/config/source/yaml/YamlConfigSource.java
@@ -117,6 +117,9 @@ private static void flattenYaml(String path, Map<Object, Object> source, Map<Str
 
             if (value instanceof String) {
                 target.put(key, (String) value);
+                if (key.contains("\"")) {
+                    target.put(key.replaceAll("\"", ""), (String) value);
+                }
             } else if (value instanceof Map) {
                 flattenYaml(key, (Map<Object, Object>) value, target);
             } else if (value instanceof List) {
@@ -127,6 +130,9 @@ private static void flattenYaml(String path, Map<Object, Object> source, Map<Str
                 }
             } else {
                 target.put(key, (value != null ? value.toString() : ""));
+                if (key.contains("\"")) {
+                    target.put(key.replaceAll("\"", ""), (value != null ? value.toString() : ""));
+                }
             }
         });
     }
diff --git a/sources/yaml/src/test/java/io/smallrye/config/source/yaml/BasicTest.java b/sources/yaml/src/test/java/io/smallrye/config/source/yaml/BasicTest.java
index 80e8de246..907e36622 100644
--- a/sources/yaml/src/test/java/io/smallrye/config/source/yaml/BasicTest.java
+++ b/sources/yaml/src/test/java/io/smallrye/config/source/yaml/BasicTest.java
@@ -45,9 +45,24 @@ void listValue() {
     }
 
     @Test
-    void EmptyFile() {
+    void emptyFile() {
         String yaml = "";
         ConfigSource src = new YamlConfigSource("Yaml", yaml);
         assertNotNull(src, "Should create config source for empty file correctly");
     }
+
+    @Test
+    void compound() {
+        ConfigSource src = new YamlConfigSource("Yaml",
+                "foo:\n" +
+                        "  bar:\n" +
+                        "    val: foobar");
+        assertEquals("foobar", src.getValue("foo.bar.val"));
+
+        ConfigSource compact = new YamlConfigSource("Yaml",
+                "foo.bar:\n" +
+                        "  val: foobar");
+        assertEquals("foobar", compact.getValue("foo.bar.val"));
+        assertEquals("foobar", compact.getValue("\"foo.bar\".val"));
+    }
 }