diff --git a/.env.example b/.env.example
index 15be0c1..363c572 100755
--- a/.env.example
+++ b/.env.example
@@ -30,6 +30,16 @@ SMTP_AUTHENTICATION=plain
 SMTP_ENABLE_STARTTLS=false
 # SMTP_STARTTLS=true
 
+# Invoice Emitter Configuration
+INVOICE_COMPANY_NAME=AperoNight
+INVOICE_COMPANY_ADDRESS_LINE_1=123 Avenue des Événements
+INVOICE_COMPANY_ADDRESS_LINE_2=75000 Paris, France
+INVOICE_COMPANY_EMAIL=contact@apero-night.fr
+INVOICE_COMPANY_PHONE=
+INVOICE_COMPANY_WEBSITE=
+INVOICE_COMPANY_VAT_NUMBER=
+INVOICE_COMPANY_SIRET=
+
 # Application variables
 STRIPE_PUBLISHABLE_KEY=pk_test_51S1M7BJWx6G2LLIXYpTvi0hxMpZ4tZSxkmr2Wbp1dQ73MKNp4Tyu4xFJBqLXK5nn4E0nEf2tdgJqEwWZLosO3QGn00kMvjXWGW
 STRIPE_SECRET_KEY=sk_test_51S1M7BJWx6G2LLIXK2pdLpRKb9Mgd3sZ30N4ueVjHepgxQKbWgMVJoa4v4ESzHQ6u6zJjO4jUvgLYPU1QLyAiFTN00sGz2ortW
diff --git a/app/services/stripe_invoice_service.rb b/app/services/stripe_invoice_service.rb
index 9cf05b0..d97c9ee 100644
--- a/app/services/stripe_invoice_service.rb
+++ b/app/services/stripe_invoice_service.rb
@@ -103,7 +103,7 @@ class StripeInvoiceService
       name: customer_name,
       metadata: {
         user_id: @order.user.id,
-        created_by: "aperonight_system"
+        created_by: "#{ENV.fetch('INVOICE_COMPANY_NAME', 'aperonight').downcase}_system"
       }
     })
 
@@ -133,7 +133,7 @@ class StripeInvoiceService
         order_id: @order.id,
         user_id: @order.user.id,
         event_name: @order.event.name,
-        created_by: "aperonight_system",
+        created_by: "#{ENV.fetch('INVOICE_COMPANY_NAME', 'aperonight').downcase}_system",
         payment_method: "checkout_session"
       },
       description: "Invoice for #{@order.event.name} - Order ##{@order.id}",
diff --git a/app/views/orders/invoice.html.erb b/app/views/orders/invoice.html.erb
index 4c9e28c..910d7a6 100644
--- a/app/views/orders/invoice.html.erb
+++ b/app/views/orders/invoice.html.erb
@@ -31,11 +31,26 @@
         <div>
           <h3 class="text-lg font-semibold text-gray-900 mb-3">Émis par</h3>
           <div class="bg-purple-50 rounded-lg p-4 border border-purple-200">
-            <h4 class="font-semibold text-purple-900">AperoNight</h4>
+            <h4 class="font-semibold text-purple-900"><%= ENV.fetch("INVOICE_COMPANY_NAME", "AperoNight") %></h4>
             <div class="mt-2 space-y-1 text-sm text-purple-700">
-              <p>123 Avenue des Événements</p>
-              <p>75000 Paris, France</p>
-              <p>contact@apero-night.fr</p>
+              <% if ENV["INVOICE_COMPANY_ADDRESS_LINE_1"].present? %>
+                <p><%= ENV["INVOICE_COMPANY_ADDRESS_LINE_1"] %></p>
+              <% end %>
+              <% if ENV["INVOICE_COMPANY_ADDRESS_LINE_2"].present? %>
+                <p><%= ENV["INVOICE_COMPANY_ADDRESS_LINE_2"] %></p>
+              <% end %>
+              <% if ENV["INVOICE_COMPANY_EMAIL"].present? %>
+                <p><%= ENV["INVOICE_COMPANY_EMAIL"] %></p>
+              <% end %>
+              <% if ENV["INVOICE_COMPANY_PHONE"].present? %>
+                <p><%= ENV["INVOICE_COMPANY_PHONE"] %></p>
+              <% end %>
+              <% if ENV["INVOICE_COMPANY_VAT_NUMBER"].present? %>
+                <p>TVA: <%= ENV["INVOICE_COMPANY_VAT_NUMBER"] %></p>
+              <% end %>
+              <% if ENV["INVOICE_COMPANY_SIRET"].present? %>
+                <p>SIRET: <%= ENV["INVOICE_COMPANY_SIRET"] %></p>
+              <% end %>
             </div>
           </div>
         </div>