diff --git a/VERSION b/VERSION
index 35e42109d..0c0a9d157 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.3-develop67
+1.17.3-develop68
diff --git a/modules/meta.py b/modules/meta.py
index 52f5a73e0..6318e5ee4 100644
--- a/modules/meta.py
+++ b/modules/meta.py
@@ -80,20 +80,27 @@ def get_file_name(self):
         if "/" in data:
             if data.endswith(".yml"):
                 return data[data.rfind("/") + 1:-4]
+            elif data.endswith(".yaml"):
+                return data[data.rfind("/") + 1:-5]
             else:
                 return data[data.rfind("/") + 1:]
         elif "\\" in data:
             if data.endswith(".yml"):
                 return data[data.rfind("\\") + 1:-4]
+            elif data.endswith(".yaml"):
+                return data[data.rfind("/") + 1:-5]
             else:
                 return data[data.rfind("\\") + 1:]
         else:
             return data
 
     def load_file(self, file_type, file_path, library_type=None, overlay=False, translation=False):
-        if translation and file_path.endswith(".yml"):
-            file_path = file_path[:-4]
-        if not translation and not file_path.endswith(".yml"):
+        if translation:
+            if file_path.endswith(".yml"):
+                file_path = file_path[:-4]
+            elif file_path.endswith(".yaml"):
+                file_path = file_path[:-5]
+        if not translation and not file_path.endswith((".yml", ".yaml")):
             file_path = f"{file_path}.yml"
         if file_type in ["URL", "Git", "Repo"]:
             if file_type == "Repo" and not self.config.custom_repo:
diff --git a/modules/util.py b/modules/util.py
index eebe13dac..b894ad84f 100644
--- a/modules/util.py
+++ b/modules/util.py
@@ -440,11 +440,12 @@ def check_dict(attr, name):
                 elif not os.path.isdir(file["folder"]):
                     logger.error(f"Config Error: Folder not found: {file['folder']}")
                 else:
-                    yml_files = glob_filter(os.path.join(file["folder"], f"*.yml"))
+                    yml_files = glob_filter(os.path.join(file["folder"], "*.yml"))
+                    yml_files.extend(glob_filter(os.path.join(file["folder"], "*.yaml")))
                     if yml_files:
                         current.extend([("File", yml, temp_vars, asset_directory) for yml in yml_files])
                     else:
-                        logger.error(f"Config Error: No YAML (.yml) files found in {file['folder']}")
+                        logger.error(f"Config Error: No YAML (.yml|.yaml) files found in {file['folder']}")
 
             if schedule and "schedule" in file and file["schedule"]:
                 current_time, run_hour, ignore_schedules = schedule