diff --git a/community.md b/community.md
index 64fb14a..ea1a30a 100644
--- a/community.md
+++ b/community.md
@@ -44,11 +44,10 @@
 |<img src="img/team/ian_maxon.jpg" width="100" height="100">         | Ian Maxon         | UC Irvine          | imaxon     |
 |<img src="img/team/ildar_absalyamov.jpg" width="100" height="100">  | Ildar Absalyamov  | UC Riverside       | ildar      |
 |<img src="img/team/jianfeng_jia.jpg" width="100" height="100">      | Jianfeng Jia      | UC Irvine          | jianfeng   |
-|<img src="img/team/anonymous.jpg" width="100" height="100">         | Jochen Wiedmann   | Software AG        | jochen     |
 |<img src="img/team/keren_ouaknine.jpg" width="100" height="100">    | Keren Ouaknine    | Hebrew University  | kereno     |
 |<img src="img/team/michael_blow.jpg" width="100" height="100">      | Michael Blow      | Couchbase          | mblow      |
 |<img src="img/team/michael_carey.jpg" width="100" height="100">     | Michael Carey     | UC Irvine          | dtabass    |
-|<img src="img/team/murtadha_hubail.jpg" width="100" height="100">   | Murtadha Hubail   | Saudi Aramco       | mhubail    |
+|<img src="img/team/murtadha_hubail.jpg" width="100" height="100">   | Murtadha Hubail   | Couchbase          | mhubail    |
 |<img src="img/team/pouria_pirzadeh.jpg" width="100" height="100">   | Pouria Pirzadeh   | UC Irvine          | pouria     |
 |<img src="img/team/anonymous.jpg" width="100" height="100">         | Preston Carman    | UC Riverside       | prestonc   |
 |<img src="img/team/raman_grover.jpg" width="100" height="100">      | Raman Grover      | Microsoft Research | raman      |
@@ -70,9 +69,11 @@
 {:.table .table-striped}
 |                                                                    | Name              | Organization       | Apache ID  |
 |--------------------------------------------------------------------|-------------------|--------------------|------------|
-|<img src="img/team/inci_cetindil.jpg" width="100" height="100">     | Inci Cetindil     | UC Irvine          | icetindil  |
-|<img src="img/team/anonymous.jpg" width="100" height="100">         | Markus Dreseler   | HPI                | mrks       |
+|<img src="img/team/anonymous.jpg" width="100" height="100">         | Chen Luo          | UC Irvine          | luochen    |
+|<img src="img/team/anonymous.jpg" width="100" height="100">         | Dmitry Lychagin   | Couchbase          | dlych      |
+|<img src="img/team/anonymous.jpg" width="100" height="100">         | Wail Alkowaileet  | KACST Saudi Arabia | wyk        |
 |<img src="img/team/wenhai_li.jpg" width="100" height="100">         | Wenhai Li         | Wuhan University   | lwhay      |
+|<img src="img/team/anonymous.jpg" width="100" height="100">         | Xikui Wang        | UC Irvine          | xikui      |
 
 <hr/>
 
@@ -82,4 +83,3 @@
 |                                                                    | Name              | Organization       |
 |--------------------------------------------------------------------|-------------------|--------------------|
 |<img src="img/team/eugenia_gabrielova.jpg" width="100" height="100">| Eugenia Gabrielova| UC Irvine          |
-|<img src="img/team/anonymous.jpg" width="100" height="100">         | Wail Alkowaileet  | KACST Saudi Arabia |
diff --git a/content/community.html b/content/community.html
index 3fe5c02..05f7a7d 100644
--- a/content/community.html
+++ b/content/community.html
@@ -237,12 +237,6 @@
       <td>jianfeng</td>
     </tr>
     <tr>
-      <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
-      <td>Jochen Wiedmann</td>
-      <td>Software AG</td>
-      <td>jochen</td>
-    </tr>
-    <tr>
       <td><img src="img/team/keren_ouaknine.jpg" width="100" height="100" /></td>
       <td>Keren Ouaknine</td>
       <td>Hebrew University</td>
@@ -263,7 +257,7 @@
     <tr>
       <td><img src="img/team/murtadha_hubail.jpg" width="100" height="100" /></td>
       <td>Murtadha Hubail</td>
-      <td>Saudi Aramco</td>
+      <td>Couchbase</td>
       <td>mhubail</td>
     </tr>
     <tr>
@@ -362,16 +356,22 @@
   </thead>
   <tbody>
     <tr>
-      <td><img src="img/team/inci_cetindil.jpg" width="100" height="100" /></td>
-      <td>Inci Cetindil</td>
+      <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
+      <td>Chen Luo</td>
       <td>UC Irvine</td>
-      <td>icetindil</td>
+      <td>luochen</td>
     </tr>
     <tr>
       <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
-      <td>Markus Dreseler</td>
-      <td>HPI</td>
-      <td>mrks</td>
+      <td>Dmitry Lychagin</td>
+      <td>Couchbase</td>
+      <td>dlych</td>
+    </tr>
+    <tr>
+      <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
+      <td>Wail Alkowaileet</td>
+      <td>KACST Saudi Arabia</td>
+      <td>wyk</td>
     </tr>
     <tr>
       <td><img src="img/team/wenhai_li.jpg" width="100" height="100" /></td>
@@ -379,6 +379,12 @@
       <td>Wuhan University</td>
       <td>lwhay</td>
     </tr>
+    <tr>
+      <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
+      <td>Xikui Wang</td>
+      <td>UC Irvine</td>
+      <td>xikui</td>
+    </tr>
   </tbody>
 </table>
 
@@ -400,11 +406,6 @@
       <td>Eugenia Gabrielova</td>
       <td>UC Irvine</td>
     </tr>
-    <tr>
-      <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
-      <td>Wail Alkowaileet</td>
-      <td>KACST Saudi Arabia</td>
-    </tr>
   </tbody>
 </table>
 
diff --git a/content/index.html b/content/index.html
index 00a14bd..92b8856 100644
--- a/content/index.html
+++ b/content/index.html
@@ -182,7 +182,7 @@
   </div>
   <div class="col-md-4">
     <h3 id="community-and-support">Community and Support</h3>
-    <p>If you have any questions, please feel free to ask on our <a href="mailto:users@asterixdb.apache.org">users</a> mailing list, which you can subscribe to by sending an empty email to <a href="users-subscribe@asterixdb.apache.org">users-subscribe</a>. Check out the <a href="community.html">Community</a> page for more details.</p>
+    <p>If you have any questions, please feel free to ask on our <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#115;&#064;&#097;&#115;&#116;&#101;&#114;&#105;&#120;&#100;&#098;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">users</a> mailing list, which you can subscribe to by sending an empty email to <a href="users-subscribe@asterixdb.apache.org">users-subscribe</a>. Check out the <a href="community.html">Community</a> page for more details.</p>
 
     <p>If you would like to know more about how to contribute to AsterixDB or any of its related components, head on over to the <a href="dev-setup.html">Contributing</a> page to learn more.</p>
   </div>