diff --git a/scripts/build_powerplants.py b/scripts/build_powerplants.py
index 00b1a9a3..74f53d80 100755
--- a/scripts/build_powerplants.py
+++ b/scripts/build_powerplants.py
@@ -118,7 +118,7 @@ if __name__ == "__main__":
     # Correct bioenergy for countries where possible
     opsd = pm.data.OPSD_VRE().powerplant.convert_country_to_alpha2()
     opsd = opsd.query('Country in @countries and Fueltype == "Bioenergy"')
-    opsd['Fueltype'] = 'biomass'
+    opsd['Name'] = "Biomass" 
     available_countries = opsd.Country.unique()
     ppl = ppl.query('not (Country in @available_countries and Fueltype == "Bioenergy")') 
     ppl = pd.concat([ppl, opsd])
@@ -146,6 +146,12 @@ if __name__ == "__main__":
 
     bus_null_b = ppl["bus"].isnull()
     if bus_null_b.any():
-        logging.warning(f"Couldn't find close bus for {bus_null_b.sum()} powerplants")
+        logging.warning(f"Couldn't find close bus for {bus_null_b.sum()} powerplants. "
+                        "Removing them from the powerplants list.")
+        ppl = ppl[~bus_null_b]
+
+    # TODO: This has to fixed in PPM, some powerplants are still duplicated 
+    cumcount = ppl.groupby(['bus', 'Fueltype']).cumcount() + 1
+    ppl.Name = ppl.Name.where(cumcount == 1, ppl.Name + " " + cumcount.astype(str))
 
     ppl.to_csv(snakemake.output[0])