diff --git a/templates/invoice/invoice.tex.ep b/templates/invoice/invoice.tex.ep
index 4c903f5..0258c9f 100644
--- a/templates/invoice/invoice.tex.ep
+++ b/templates/invoice/invoice.tex.ep
@@ -26,7 +26,7 @@
 \hspace*{\stretch{1}}\includegraphics[width=3cm]{<%== $AssetPath %>/logo.pdf}
 
 \textbf{OmniOS Community Edition Association}\newline
-Aarweg 17, 4600 Olten\newline
+Aarweg 15, 4600 Olten\newline
 Switzerland\\[2ex]
 patrons@omnios.org
 
diff --git a/templates/invoice/mail/invoice_created.txt.ep b/templates/invoice/mail/invoice_created.txt.ep
index 4416d66..cb37729 100644
--- a/templates/invoice/mail/invoice_created.txt.ep
+++ b/templates/invoice/mail/invoice_created.txt.ep
@@ -17,5 +17,5 @@ Address:
 
 --
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/invoice/mail/invoice_requested.html.ep b/templates/invoice/mail/invoice_requested.html.ep
index e3cf0fa..a2e80c7 100644
--- a/templates/invoice/mail/invoice_requested.html.ep
+++ b/templates/invoice/mail/invoice_requested.html.ep
@@ -40,7 +40,7 @@ The OmniOSce Team</p>
 
 <address>
 OmniOS Community Edition Association<br/>
-Aarweg 17, 4600 Olten, Switzerland<br/>
+Aarweg 15, 4600 Olten, Switzerland<br/>
 patrons@omnios.org</address>
 
 </body>
diff --git a/templates/invoice/mail/invoice_requested.txt.ep b/templates/invoice/mail/invoice_requested.txt.ep
index 9b21592..4cb6c3f 100644
--- a/templates/invoice/mail/invoice_requested.txt.ep
+++ b/templates/invoice/mail/invoice_requested.txt.ep
@@ -25,5 +25,5 @@ The OmniOSce Team
 
 -- 
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/invoice/mail/quote_created.txt.ep b/templates/invoice/mail/quote_created.txt.ep
index d1b2faa..bda9a88 100644
--- a/templates/invoice/mail/quote_created.txt.ep
+++ b/templates/invoice/mail/quote_created.txt.ep
@@ -19,5 +19,5 @@ Address:
 
 --
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/invoice/mail/quote_requested.html.ep b/templates/invoice/mail/quote_requested.html.ep
index d3b75a1..844de70 100644
--- a/templates/invoice/mail/quote_requested.html.ep
+++ b/templates/invoice/mail/quote_requested.html.ep
@@ -40,7 +40,7 @@ The OmniOSce Team</p>
 
 <address>
 OmniOS Community Edition Association<br/>
-Aarweg 17, 4600 Olten, Switzerland<br/>
+Aarweg 15, 4600 Olten, Switzerland<br/>
 patrons@omnios.org</address>
 <br/>
 <small>*) We add <%= $quote_fee %> <%= $currency %> to the quoted price for PO based purchases as they tend to involve extra paperwork from our side.</small>
diff --git a/templates/invoice/mail/quote_requested.txt.ep b/templates/invoice/mail/quote_requested.txt.ep
index ffed450..93aa358 100644
--- a/templates/invoice/mail/quote_requested.txt.ep
+++ b/templates/invoice/mail/quote_requested.txt.ep
@@ -27,5 +27,5 @@ The OmniOSce Team
 
 --
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/invoice/quote.tex.ep b/templates/invoice/quote.tex.ep
index 542902b..6c5f560 100644
--- a/templates/invoice/quote.tex.ep
+++ b/templates/invoice/quote.tex.ep
@@ -26,7 +26,7 @@
 \hspace*{\stretch{1}}\includegraphics[width=3cm]{<%== $AssetPath %>/logo.pdf}
 
 \textbf{OmniOS Community Edition Association}\newline
-Aarweg 17, 4600 Olten\newline
+Aarweg 15, 4600 Olten\newline
 Switzerland\\[2ex]
 patrons@omnios.org
 
diff --git a/templates/patron/mail/charge.failed.txt.ep b/templates/patron/mail/charge.failed.txt.ep
index 5e090c9..daf47b0 100644
--- a/templates/patron/mail/charge.failed.txt.ep
+++ b/templates/patron/mail/charge.failed.txt.ep
@@ -12,5 +12,5 @@ ps. You can cancel your OmniOSce subscription at any time via <%= $stripeData->{
 % }
 -- 
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/patron/mail/charge.succeeded.txt.ep b/templates/patron/mail/charge.succeeded.txt.ep
index 058831c..98650a5 100644
--- a/templates/patron/mail/charge.succeeded.txt.ep
+++ b/templates/patron/mail/charge.succeeded.txt.ep
@@ -14,5 +14,5 @@ ps. You can cancel your OmniOSce subscription at any time via <%= $stripeData->{
 % }
 -- 
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/patron/mail/customer.subscription.created.txt.ep b/templates/patron/mail/customer.subscription.created.txt.ep
index e1ca34c..ea87070 100644
--- a/templates/patron/mail/customer.subscription.created.txt.ep
+++ b/templates/patron/mail/customer.subscription.created.txt.ep
@@ -13,5 +13,5 @@ ps. You can cancel your OmniOSce subscription at any time via <%= $stripeData->{
 
 -- 
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/patron/mail/customer.subscription.deleted.txt.ep b/templates/patron/mail/customer.subscription.deleted.txt.ep
index c49a0da..217a091 100644
--- a/templates/patron/mail/customer.subscription.deleted.txt.ep
+++ b/templates/patron/mail/customer.subscription.deleted.txt.ep
@@ -13,5 +13,5 @@ The OmniOSce Team
 
 -- 
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org
diff --git a/templates/patron/mail/invoice.upcoming.txt.ep b/templates/patron/mail/invoice.upcoming.txt.ep
index 7017b0a..599ec33 100644
--- a/templates/patron/mail/invoice.upcoming.txt.ep
+++ b/templates/patron/mail/invoice.upcoming.txt.ep
@@ -12,5 +12,5 @@ The OmniOSce Team
 
 -- 
 OmniOS Community Edition Association
-Aarweg 17, 4600 Olten, Switzerland
+Aarweg 15, 4600 Olten, Switzerland
 patrons@omnios.org