diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
index a6686be..e3c99a4 100644
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -2,6 +2,8 @@
 
 files-definition:               ["definition.json"]
 
+files-layout-gds:               ["*Makefile"]
+
 files-layout-gds:               ["*.gds"]
 files-layout-lef-magic:         ["*.magic.lef"]
 files-layout-lef:               ["*.lef"]
diff --git a/.github/labels.yml b/.github/labels.yml
index ac55372..03452bb 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -53,6 +53,10 @@
 # File related labels are colored purple: d61dae
 ##########################################################################
 
+- name: "files-build"
+  description: "Issues related to the Makefiles / build infrastructure."
+  color: "d61dae"
+
 - name: "files-definition"
   description: "Issues related to the definition.json provided for each cell."
   color: "d61dae"
diff --git a/scripts/python-skywater-pdk/skywater_pdk/liberty.py b/scripts/python-skywater-pdk/skywater_pdk/liberty.py
index f0686f9..b7d61b1 100755
--- a/scripts/python-skywater-pdk/skywater_pdk/liberty.py
+++ b/scripts/python-skywater-pdk/skywater_pdk/liberty.py
@@ -843,8 +843,16 @@
             help="Include power leakage in file output.",
             action='store_true',
             default=False)
+    parser.add_argument(
+            "--debug",
+            help="Include verbose debug output on the console.",
+            action='store_true',
+            default=False)
 
     args = parser.parse_args()
+    if args.debug:
+        global debug
+        debug = True
 
     libdir = args.library_path[0]