diff --git a/config/energy_node_positions.yml b/config/energy_node_positions.yml
index f5420220a2..857dc292a2 100644
--- a/config/energy_node_positions.yml
+++ b/config/energy_node_positions.yml
@@ -1042,7 +1042,7 @@ energy_heat_well_shallow_heatpump_mt_geothermal:
   "y": 5280
 energy_heat_well_shallow_lt_geothermal:
   x: 6060
-  "y": 4500
+  "y": 4380
 energy_hydrogen_after_distribution:
   x: 5200
   "y": 7220
diff --git a/config/user_curves.yml b/config/user_curves.yml
index c7a4eb3b1d..be5317438e 100644
--- a/config/user_curves.yml
+++ b/config/user_curves.yml
@@ -653,7 +653,7 @@ weather/solar_thermal:
   reduce:
     as: full_load_hours
     sets:
-      - flh_of_solar_thermal
+      - flh_of_solar_thermal_user_curve
 
 geothermal_heat:
   type: capacity_profile
@@ -661,7 +661,7 @@ geothermal_heat:
   reduce:
     as: full_load_hours
     sets:
-      - flh_of_geothermal_heat
+      - flh_of_geothermal_heat_user_curve
 
 river:
   type: capacity_profile
@@ -669,7 +669,7 @@ river:
   reduce:
     as: full_load_hours
     sets:
-      - flh_of_hydro_river
+      - flh_of_hydro_river_user_curve
 
 weather/air_temperature:
   type: temperature
diff --git a/inputs/full_load_hours/flh_of_geothermal_heat.ad b/inputs/full_load_hours/flh_of_geothermal_heat.ad
deleted file mode 100644
index 6ba17155ab..0000000000
--- a/inputs/full_load_hours/flh_of_geothermal_heat.ad
+++ /dev/null
@@ -1,4 +0,0 @@
-- query = UPDATE(V(energy_heat_well_geothermal, industry_heat_well_geothermal, agriculture_geothermal), full_load_hours, USER_INPUT())
-- priority = 3
-- unit = hours
-- update_period = future
diff --git a/inputs/full_load_hours/flh_of_geothermal_heat_user_curve.ad b/inputs/full_load_hours/flh_of_geothermal_heat_user_curve.ad
new file mode 100644
index 0000000000..37a1329f74
--- /dev/null
+++ b/inputs/full_load_hours/flh_of_geothermal_heat_user_curve.ad
@@ -0,0 +1,24 @@
+# This input updates the FLHs of geothermal heat
+# These FLH inputs are not listed in the front-end, but is automatically triggered when a user uploads the corresponding custom curve
+# You can see this in the user_curves.yml
+
+- query =
+    UPDATE(
+      V(
+        energy_heat_well_shallow_lt_geothermal,
+        energy_heat_well_deep_ht_geothermal,
+        energy_heat_well_deep_mt_geothermal,
+        energy_heat_well_shallow_heatpump_mt_geothermal,
+        industry_heat_well_geothermal,
+        agriculture_geothermal
+      ),
+      full_load_hours,
+      USER_INPUT()
+    )
+- priority = 1
+- max_value = 8760.0
+- min_value = 0.0
+- start_value_gql = present:V(agriculture_geothermal, full_load_hours)
+- step_value = 1.0
+- unit = hours
+- update_period = future
diff --git a/inputs/full_load_hours/flh_of_hydro_river.ad b/inputs/full_load_hours/flh_of_hydro_river.ad
deleted file mode 100644
index cf7140cecb..0000000000
--- a/inputs/full_load_hours/flh_of_hydro_river.ad
+++ /dev/null
@@ -1,4 +0,0 @@
-- query = UPDATE(V(energy_power_hydro_river), full_load_hours, USER_INPUT())
-- priority = 3
-- unit = hours
-- update_period = future
diff --git a/inputs/full_load_hours/flh_of_hydro_river_user_curve.ad b/inputs/full_load_hours/flh_of_hydro_river_user_curve.ad
new file mode 100644
index 0000000000..682594f15f
--- /dev/null
+++ b/inputs/full_load_hours/flh_of_hydro_river_user_curve.ad
@@ -0,0 +1,19 @@
+# This input updates the FLHs of hydro river
+# These FLH inputs are not listed in the front-end, but is automatically triggered when a user uploads the corresponding custom curve
+# You can see this in the user_curves.yml
+
+- query =
+    original_nou = V(energy_power_hydro_river, number_of_units);
+
+    EACH(
+      UPDATE(V(energy_power_hydro_river), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_power_hydro_river), number_of_units, original_nou),
+      UPDATE(V(energy_power_hydro_river), preset_demand_by_electricity_production, V(energy_power_hydro_river, production_based_on_number_of_units)),
+    )
+- priority = 1
+- max_value = 8760.0
+- min_value = 0.0
+- start_value_gql = present:V(energy_power_hydro_river, full_load_hours)
+- step_value = 1.0
+- unit = hours
+- update_period = future
diff --git a/inputs/full_load_hours/flh_of_solar_thermal.ad b/inputs/full_load_hours/flh_of_solar_thermal.ad
deleted file mode 100644
index 0143cb0f04..0000000000
--- a/inputs/full_load_hours/flh_of_solar_thermal.ad
+++ /dev/null
@@ -1,4 +0,0 @@
-- query = UPDATE(V(energy_heat_solar_thermal, buildings_space_heater_solar_thermal, households_water_heater_solar_thermal), full_load_hours, USER_INPUT())
-- priority = 3
-- unit = hours
-- update_period = future
diff --git a/inputs/full_load_hours/flh_of_solar_thermal_user_curve.ad b/inputs/full_load_hours/flh_of_solar_thermal_user_curve.ad
new file mode 100644
index 0000000000..9a2df277fd
--- /dev/null
+++ b/inputs/full_load_hours/flh_of_solar_thermal_user_curve.ad
@@ -0,0 +1,23 @@
+# This input updates the FLHs of solar thermal
+# These FLH inputs are not listed in the front-end, but is automatically triggered when a user uploads the corresponding custom curve
+# You can see this in the user_curves.yml
+
+- query =
+    UPDATE(
+      V(
+        energy_heat_solar_ht_solar_thermal,
+        energy_heat_solar_lt_solar_thermal,
+        energy_heat_solar_mt_solar_thermal,
+        buildings_space_heater_solar_thermal,
+        households_water_heater_solar_thermal
+      ),
+    full_load_hours,
+    USER_INPUT()
+  )
+- priority = 1
+- max_value = 8760.0
+- min_value = 0.0
+- start_value_gql = present:V(households_water_heater_solar_thermal, full_load_hours)
+- step_value = 1.0
+- unit = hours
+- update_period = future