diff --git a/angular/blocks/footer.html b/angular/blocks/footer.html
index c6bddb1..229e3b2 100644
--- a/angular/blocks/footer.html
+++ b/angular/blocks/footer.html
@@ -33,7 +33,7 @@
 					<li><h4>Useful Links</h4></li>
 					<li><a href="https://projects.eclipse.org/projects/polarsys.capella" target="_blank">Project Page</a></li>
 					<li><a href="https://forum.mbse-capella.org/" target="_blank">Forum</a></li>
-					<li><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Capella" target="_blank">Report a Bug</a></li>
+					<li><a href="https://github.com/eclipse/capella/wiki/Repositories" target="_blank">Report a Bug</a></li>
 					<li><a href="https://github.com/eclipse/capella" target="_blank">Source Code <i class="fa fa-github" aria-hidden="true"></i></a></li>
 					<li><a href="https://github.com/eclipse/capella/wiki#factory-capella-development" target="_blank">How to Contribute</a></li>
 				</ul>
diff --git a/community.html b/community.html
index d147024..09c2fb0 100644
--- a/community.html
+++ b/community.html
@@ -111,12 +111,12 @@
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="300ms">
                            <p>
-                                <a href="http://polarsys.org/bugs/describecomponents.cgi?product=Capella" target="_blank"><img src="images/icons/icon_bugzilla.png" alt="Bugzilla Capella" ></a>
+                                <a href="https://github.com/eclipse/capella/wiki/Repositories" target="_blank"><img src="images/icons/icon_bugzilla.png" alt="Bug tracker Capella" ></a>
                             </p>
                              <div>
-                                <h4>Bugzilla</h4>
-                                <p>Review and create bugzilla entries to report bugs and propose enhancement</p>
-                                <p><a href="http://polarsys.org/bugs/describecomponents.cgi?product=Capella" target="_blank">Read more <i class="fa fa-arrow-circle-right" aria-hidden="true"></i>
+                                <h4>Bug tracker</h4>
+                                <p>Review and create issues to report bugs and propose enhancement</p>
+                                <p><a href="https://github.com/eclipse/capella/wiki/Repositories" target="_blank">Read more <i class="fa fa-arrow-circle-right" aria-hidden="true"></i>
                                 </a></p>
                             </div>
                     </div>
diff --git a/json/resources.json b/json/resources.json
index fce1ba6..88ee53d 100644
--- a/json/resources.json
+++ b/json/resources.json
@@ -1973,8 +1973,8 @@
                 "thumb": "images/thumbs/resources/thumb_capella-linkedin.jpg"
             },
             {
-                "title": "Bugzilla",
-                "descr": "Official buck-tracking system of Capella project",
+                "title": "Bug tracker",
+                "descr": "Bug-tracking system of Capella project",
                 "author": "",
                 "year": "",
                 "language": "EN",
@@ -1982,7 +1982,7 @@
                 "topic_order": "3",
                 "type": "Other",
                 "type_order": "99",
-                "link": "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Capella",
+                "link": "https://github.com/eclipse/capella/wiki/Repositories",
                 "thumb": "images/thumbs/resources/thumb_capella-bugzilla.jpg"
             },
             {
diff --git a/support.html b/support.html
index 295412c..a083ec3 100644
--- a/support.html
+++ b/support.html
@@ -107,12 +107,12 @@
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="300ms">
                            <p>
-                                <a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=__all__&product=Capella" target="_blank"><img src="images/icons/icon_bugzilla.png" alt="Bugzilla Capella" ></a>
+                                <a href="https://github.com/eclipse/capella/wiki/Repositories" target="_blank"><img src="images/icons/icon_bugzilla.png" alt="Bug tracker" ></a>
                             </p>
                              <div>
-                                <h4>Bugzilla</h4>
-                                <p>Review and create bugzilla entries to report bugs and propose enhancement</p>
-                                <p><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Capella" target="_blank">Read more <i class="fa fa-arrow-circle-right" aria-hidden="true"></i>
+                                <h4>Bug tracker</h4>
+                                <p>Review and create issues to report bugs and propose enhancement</p>
+                                <p><a href="https://github.com/eclipse/capella/wiki/Repositories" target="_blank">Read more <i class="fa fa-arrow-circle-right" aria-hidden="true"></i>
                                 </a></p>
                             </div>
                     </div>