diff --git a/.gitea/workflows/ci-test.yaml b/.gitea/workflows/ci-test.yaml
index f798e73..5301525 100644
--- a/.gitea/workflows/ci-test.yaml
+++ b/.gitea/workflows/ci-test.yaml
@@ -120,8 +120,9 @@ jobs:
           python-version: '3.11'
 
       - name: Install dependencies
-        run: pip install pyyaml
-
+        run: |
+          pip install pyyaml
+          pip install yamllint
 
       - name: Init OpenTofu
         working-directory: infra/iac
diff --git a/merge_yaml.py b/merge_yaml.py
index e9cff7e..a7c1d81 100644
--- a/merge_yaml.py
+++ b/merge_yaml.py
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python3
 import yaml
 import sys
@@ -25,8 +24,21 @@ def main():
     file2 = input_data["file2"]
 
     with open(file1, "r") as f1, open(file2, "r") as f2:
-        yaml1 = yaml.safe_load(f1)
-        yaml2 = yaml.safe_load(f2)
+        
+        try:
+            yaml1 = yaml.safe_load(f1)
+        except yaml.YAMLError as e:
+            print("Erro ao carregar YAML do primeiro ficheiro:")
+            print(f1.read())
+            raise e
+        
+        try:
+            yaml2 = yaml.safe_load(f2)
+        except yaml.YAMLError as e:
+            print("Erro ao carregar YAML do segundo ficheiro:")
+            print(f2.read())
+            raise e
+
 
     merged = deep_merge_yaml(yaml1, yaml2)
     print(json.dumps({"merged_yaml": yaml.dump(merged, sort_keys=False)}))