diff --git a/kvirt/cli.py b/kvirt/cli.py
index ff1eacff6..0ffa8299a 100755
--- a/kvirt/cli.py
+++ b/kvirt/cli.py
@@ -1503,7 +1503,7 @@ def create_vm(args):
             pprint(f"Using {image} as profile")
         profile = image
     elif profile is not None:
-        if profile.endswith('.yml'):
+        if profile.endswith('.yml') or profile.endswith('.yaml'):
             profilefile = profile
             profile = None
             if not os.path.exists(profilefile):
diff --git a/kvirt/config.py b/kvirt/config.py
index b1166f0e3..2536aa486 100644
--- a/kvirt/config.py
+++ b/kvirt/config.py
@@ -1550,7 +1550,7 @@ def plan(self, plan, ansible=False, url=None, path=None, container=False, inputf
         if url is not None:
             if url.startswith('/'):
                 url = f"file://{url}"
-            if not url.endswith('.yml'):
+            if not url.endswith('.yml') and not url.endswith('.yaml'):
                 url = f"{url}/kcli_plan.yml"
                 pprint(f"Trying to retrieve {url}")
             inputfile = os.path.basename(url)
@@ -1800,7 +1800,7 @@ def plan(self, plan, ansible=False, url=None, path=None, container=False, inputf
                     continue
                 elif planurl is not None:
                     path = planentry
-                    if not planurl.endswith('yml'):
+                    if not planurl.endswith('yml') and not planurl.endswith('yaml'):
                         planurl = f"{planurl}/kcli_plan.yml"
                 else:
                     path = os.path.dirname(planfile) or '.'