diff --git a/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java b/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java
index aa861c0fc..4bf0dea12 100644
--- a/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java
+++ b/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java
@@ -180,8 +180,8 @@ public class ErrorServlet extends HttpServlet {
             out.println("<hr>");
             out.println("<p>");
             out.println(_t("Please report bugs on {0} or {1}.",
-                           "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
-                           "<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>"));
+                           "<a href=\"http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues/new\">git.idk.i2p</a>",
+                           "<a href=\"https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues/new\">i2pgit.org</a>"));
             out.println("<p>");
             out.println(_t("Please include this information in bug reports") + ':');
             out.print("</p></div><div class=\"sorry\" id=\"warning2\"><h3>");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
index 76edd367b..831062e30 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
@@ -104,7 +104,7 @@ public class HomeHelper extends HelperBase {
         _x("Graphs") + S + _x("Visualize information about the router") + S + "/graphs" + S + I + "chart_line.png" + S +
         _x("I2P Technical Docs") + S + _x("Technical documentation") + S + "http://i2p-projekt.i2p/how" + S + I + "education.png" + S +
         _x("Trac Wiki") + S + S + "http://trac.i2p2.i2p/" + S + I + "trac_wiki.png" + S +
-        _x("I2P Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S +
+        _x("I2P Bug Reports") + S + _x("Bug tracker") + S + "http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues" + S + I + "bug.png" + S +
         "stats.i2p" + S + _x("I2P Network Statistics") + S + "http://stats.i2p/cgi-bin/dashboard.cgi" + S + I + "chart_bar.png" + S +
         "";
 
diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp
index 03b31e92f..052d4dc51 100644
--- a/apps/routerconsole/jsp/error500.jsp
+++ b/apps/routerconsole/jsp/error500.jsp
@@ -39,8 +39,8 @@
 <p>
 <% /* note to translators - both parameters are URLs */
 %><%=intl._t("Please report bugs on {0} or {1}.",
-          "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
-          "<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
+          "<a href=\"http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues/new\">git.idk.i2p</a>",
+          "<a href=\"https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues/new\">i2pgit.org</a>")%>
 <p><%=intl._t("Please include this information in bug reports")%>:
 </p></div><div class="sorry" id="warning2">
 <h3><%=intl._t("Error Details")%></h3>
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 5445c3713..d88995e16 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -16,8 +16,8 @@
 <%=intl._t("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>
 <% /* note to translators - both parameters are URLs */
 %><%=intl._t("Please report bugs on {0} or {1}.",
-          "<a href=\"http://trac.i2p2.i2p/\">trac.i2p2.i2p</a>",
-          "<a href=\"https://trac.i2p2.de/\">trac.i2p2.de</a>")%>
+          "<a href=\"http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues/new\">git.idk.i2p</a>",
+          "<a href=\"https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues/new\">i2pgit.org</a>")%>
   </td></tr>
 </tbody></table>