diff --git a/modules/mailman/files/html-templates-en/archidxhead.html b/modules/mailman/files/html-templates-en/archidxhead.html
index b08b68f..9db8595 100644
--- a/modules/mailman/files/html-templates-en/archidxhead.html
+++ b/modules/mailman/files/html-templates-en/archidxhead.html
@@ -27,7 +27,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {
diff --git a/modules/mailman/files/html-templates-en/archtoc.html b/modules/mailman/files/html-templates-en/archtoc.html
index 7410f6e..f3cc27f 100644
--- a/modules/mailman/files/html-templates-en/archtoc.html
+++ b/modules/mailman/files/html-templates-en/archtoc.html
@@ -26,7 +26,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {
diff --git a/modules/mailman/files/html-templates-en/archtocnombox.html b/modules/mailman/files/html-templates-en/archtocnombox.html
index febc69e..5694863 100644
--- a/modules/mailman/files/html-templates-en/archtocnombox.html
+++ b/modules/mailman/files/html-templates-en/archtocnombox.html
@@ -26,7 +26,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {
diff --git a/modules/mailman/files/html-templates-en/article.html b/modules/mailman/files/html-templates-en/article.html
index 29163c6..872dc6a 100644
--- a/modules/mailman/files/html-templates-en/article.html
+++ b/modules/mailman/files/html-templates-en/article.html
@@ -28,7 +28,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {
diff --git a/modules/mailman/files/html-templates-en/emptyarchive.html b/modules/mailman/files/html-templates-en/emptyarchive.html
index bc0e82a..ab034aa 100644
--- a/modules/mailman/files/html-templates-en/emptyarchive.html
+++ b/modules/mailman/files/html-templates-en/emptyarchive.html
@@ -24,7 +24,8 @@
 i<script type="text/javascript">
 
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-17511903-9']);
+  _gaq.push(['_setAccount', 'UA-17511903-1']);
+  _gaq.push(['_setDomainName', '.openstack.org']);
   _gaq.push(['_trackPageview']);
 
   (function() {
diff --git a/modules/mailman/files/html-templates-en/listinfo.html b/modules/mailman/files/html-templates-en/listinfo.html
index 049066f..2a747fd 100644
--- a/modules/mailman/files/html-templates-en/listinfo.html
+++ b/modules/mailman/files/html-templates-en/listinfo.html
@@ -25,7 +25,8 @@
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
   _gaq.push(['_trackPageview']);
 
   (function() {
diff --git a/modules/mailman/files/html-templates-en/options.html b/modules/mailman/files/html-templates-en/options.html
index d6d752e..1e4db36 100644
--- a/modules/mailman/files/html-templates-en/options.html
+++ b/modules/mailman/files/html-templates-en/options.html
@@ -24,7 +24,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {
diff --git a/modules/mailman/files/html-templates-en/roster.html b/modules/mailman/files/html-templates-en/roster.html
index 513d683..aa90e7b 100644
--- a/modules/mailman/files/html-templates-en/roster.html
+++ b/modules/mailman/files/html-templates-en/roster.html
@@ -23,7 +23,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {
diff --git a/modules/mailman/files/html-templates-en/subscribe.html b/modules/mailman/files/html-templates-en/subscribe.html
index ba6852f..a78f8a2 100644
--- a/modules/mailman/files/html-templates-en/subscribe.html
+++ b/modules/mailman/files/html-templates-en/subscribe.html
@@ -23,7 +23,8 @@
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-9']);
+    _gaq.push(['_setAccount', 'UA-17511903-1']);
+    _gaq.push(['_setDomainName', '.openstack.org']);
     _gaq.push(['_trackPageview']);
 
     (function() {