diff --git a/config.default.yaml b/config.default.yaml
index 7aa23901..ead33e2b 100644
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -11,6 +11,7 @@ foresight: 'overnight' #options are overnight, myopic, perfect (perfect is not y
 
 scenario:
   sectors: [E]  # ignore this legacy setting
+  year: [''] # weather year
   simpl: ['']  # only relevant for PyPSA-Eur
   lv: [1.0,1.5]    # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
   clusters: [45,50] # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
@@ -34,6 +35,8 @@ snapshots:
   end: "2014-01-01"
   closed: 'left' # end is not inclusive
 
+countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK']
+
 atlite:
   cutout_dir: '../pypsa-eur/cutouts'
   cutout_name: "europe-2013-era5"
diff --git a/config.myopic.yaml b/config.myopic.yaml
index c7f5ac1e..0dc4cdf3 100644
--- a/config.myopic.yaml
+++ b/config.myopic.yaml
@@ -11,6 +11,7 @@ foresight: 'myopic' #options are overnight, myopic, perfect (perfect is not yet
 
 scenario:
   sectors: [E]  # ignore this legacy setting
+  year: [''] # weather year
   simpl: ['']  # only relevant for PyPSA-Eur
   lv: [1.0,1.5]    # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
   clusters: [45,50] # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
@@ -34,6 +35,8 @@ snapshots:
   end: "2014-01-01"
   closed: 'left' # end is not inclusive
 
+countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK']
+
 atlite:
   cutout_dir: '../pypsa-eur/cutouts'
   cutout_name: "europe-2013-era5"
diff --git a/scripts/build_industrial_energy_demand_per_country_today.py b/scripts/build_industrial_energy_demand_per_country_today.py
index 7593477b..00611318 100644
--- a/scripts/build_industrial_energy_demand_per_country_today.py
+++ b/scripts/build_industrial_energy_demand_per_country_today.py
@@ -61,6 +61,8 @@ eu28 = ['FR', 'DE', 'GB', 'IT', 'ES', 'PL', 'SE', 'NL', 'BE', 'FI',
         'DK', 'PT', 'RO', 'AT', 'BG', 'EE', 'GR', 'LV', 'CZ',
         'HU', 'IE', 'SK', 'LT', 'HR', 'LU', 'SI', 'CY', 'MT']
 
+eu28 = list(set(eu28).intersection(snakemake.config["countries"]))
+
 jrc_names = {"GR" : "EL",
              "GB" : "UK"}
 
diff --git a/scripts/build_industrial_production_per_country.py b/scripts/build_industrial_production_per_country.py
index c8fa6910..4a993a91 100644
--- a/scripts/build_industrial_production_per_country.py
+++ b/scripts/build_industrial_production_per_country.py
@@ -39,6 +39,7 @@ eu28 = ['FR', 'DE', 'GB', 'IT', 'ES', 'PL', 'SE', 'NL', 'BE', 'FI',
 
 countries = non_EU + eu28
 
+countries = list(set(countries).intersection(snakemake.config["countries"]))
 
 sectors = ['Iron and steel','Chemicals Industry','Non-metallic mineral products',
            'Pulp, paper and printing', 'Food, beverages and tobacco', 'Non Ferrous Metals',