diff --git a/tools/tag_history_from_git.py b/tools/tag_history_from_git.py
index 555b720b52..0f5a57279f 100755
--- a/tools/tag_history_from_git.py
+++ b/tools/tag_history_from_git.py
@@ -116,7 +116,7 @@ for series, milestones in sorted(series_data.items()):
     if not os.path.exists(d):
         print('creating directory %s' % d)
         os.makedirs(d)
-    filename = '%s/%s.yaml' % (d, args.project)
+    filename = '%s/%s.yaml' % (d, os.path.basename(repo))
     print('creating %s' % filename)
     with open(filename, 'w') as f:
         f.write('---\n')
diff --git a/tools/tag_history_from_lp.py b/tools/tag_history_from_lp.py
index 6d2eb7ceda..db432a3d32 100755
--- a/tools/tag_history_from_lp.py
+++ b/tools/tag_history_from_lp.py
@@ -102,7 +102,7 @@ for series, milestones in sorted(series_data.items()):
     if not os.path.exists(d):
         print('creating directory %s' % d)
         os.makedirs(d)
-    filename = '%s/%s.yaml' % (d, args.project)
+    filename = '%s/%s.yaml' % (d, os.path.basename(repo))
     print('creating %s' % filename)
     with open(filename, 'w') as f:
         f.write('---\n')