diff --git a/config.default.yaml b/config.default.yaml
index b56553ec..45e431ac 100644
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -232,7 +232,7 @@ sector:
   marginal_cost_storage: 0. #1e-4
   methanation: true
   helmeth: true
-  coal_cc: true
+  coal_cc: false
   dac: true
   co2_vent: true
   SMR: true
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index 66be98de..3e076886 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -1118,23 +1118,24 @@ def add_storage_and_grids(n, costs):
             lifetime=costs.at['helmeth', 'lifetime']
         )
 
-    if options['coal_cc']:
+    if options.get('coal_cc'):
 
-        for generator,carrier in [("coal CC","coal")]:
-            n.madd("Link",
-                    nodes + " " + generator,
-                    bus0=["EU " + carrier]*len(nodes),
-                    bus1=nodes,
-                    bus2="co2 atmosphere",
-                    bus3="co2 stored",
-                    marginal_cost=costs.at['coal','efficiency']*costs.at['coal','VOM'], #NB: VOM is per MWel
-                    capital_cost=costs.at['coal','efficiency']*costs.at['coal','fixed']+ costs.at['biomass CHP capture','fixed']*costs.at[carrier,'CO2 intensity'], #NB: fixed cost is per MWel
-                    p_nom_extendable=True,
-                    carrier=generator,
-                    efficiency=costs.at['coal','efficiency'],
-                    efficiency2=costs.at[carrier,'CO2 intensity']*(1-costs.at['biomass CHP capture','capture_rate']),
-                    efficiency3=costs.at[carrier,'CO2 intensity']*costs.at['biomass CHP capture','capture_rate'],
-                    lifetime=costs.at['coal','lifetime'])
+n.madd("Link",
+    spatial.nodes,
+    suffix=" coal CC",
+    bus0=spatial.coal.nodes,
+    bus1=spatial.nodes,
+    bus2="co2 atmosphere",
+    bus3="co2 stored",
+    marginal_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'VOM'], #NB: VOM is per MWel
+    capital_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at['coal', 'CO2 intensity'], #NB: fixed cost is per MWel
+    p_nom_extendable=True,
+    carrier="coal",
+    efficiency=costs.at['coal', 'efficiency'],
+    efficiency2=costs.at['coal', 'CO2 intensity'] * (1 - costs.at['biomass CHP capture','capture_rate']),
+    efficiency3=costs.at['coal', 'CO2 intensity'] * costs.at['biomass CHP capture','capture_rate'],
+    lifetime=costs.at['coal','lifetime']
+)
 
     if options['SMR']: