diff --git a/energy_selfconsumption/wizards/contract_generation_wizard.py b/energy_selfconsumption/wizards/contract_generation_wizard.py
index 239a541d3c3f681cd2b3944aea16bb4c7581b20b..8425cf16d6e571c1b369a6c7c817e4c551718add 100644
--- a/energy_selfconsumption/wizards/contract_generation_wizard.py
+++ b/energy_selfconsumption/wizards/contract_generation_wizard.py
@@ -4,27 +4,6 @@ from odoo import _, fields, models
 class ContractGenerationWizard(models.TransientModel):
     _name = "energy_selfconsumption.contract_generation.wizard"
 
-    price_energy = fields.Float(string="Price (€/kWn/day)")
-
-    recurring_interval = fields.Integer(
-        default=1,
-        string="Invoice Every",
-        help="Invoice every (Days/Week/Month/Year)",
-    )
-    recurring_rule_type = fields.Selection(
-        [
-            ("daily", "Day(s)"),
-            ("weekly", "Week(s)"),
-            ("monthly", "Month(s)"),
-            ("monthlylastday", "Month(s) last day"),
-            ("quarterly", "Quarter(s)"),
-            ("semesterly", "Semester(s)"),
-            ("yearly", "Year(s)"),
-        ],
-        default="monthly",
-        string="Recurrence",
-        help="Specify Interval for automatic invoice generation.",
-    )
     selfconsumption_id = fields.Many2one(
         "energy_selfconsumption.selfconsumption", readonly=True
     )
@@ -114,18 +93,14 @@ class ContractGenerationWizard(models.TransientModel):
 
             self.env["contract.contract"].create(
                 {
-                    "name": _("Contract - %s - %s")
-                    % (self.selfconsumption_id.name, partner_data["parent_id"].name),
+                    "name": self.selfconsumption_id.contract_template_id.name,
                     "partner_id": partner_data["parent_id"].id,
                     "invoice_partner_id": partner_data["parent_id"].id,
-                    "journal_id": journal_id.id,
-                    "recurring_interval": self.recurring_interval,
-                    "recurring_rule_type": self.recurring_rule_type,
                     "recurring_invoicing_type": "post-paid",
                     "date_start": fields.date.today(),
-                    "company_id": self.env.company.id,
                     "contract_line_ids": contract_lines,
                     "project_id": self.selfconsumption_id.project_id.id,
+                    "contract_template_id": self.selfconsumption_id.contract_template_id.id,
                 }
             )