diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 370dd30345..88953a907a 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -84,7 +84,7 @@ The process of reviewing proposed changes differs depending of the size and impa
 
 A minor change is a bug fix, a smaller enhancement or a smaller addition to existing features.
 
-To propose a minor change, simply create an issue in our [issue tracker](https://issues.jboss.org/browse/KEYCLOAK) and
+To propose a minor change, simply create an issue in our [issue tracker](https://github.com/keycloak/keycloak/issues) and
 send a pull request.
 
 A maintainer will be responsible for ultimately approving the pull request. The maintainer may do a deep review of the
diff --git a/examples/themes/src/main/resources/theme/logo-example/welcome/index.ftl b/examples/themes/src/main/resources/theme/logo-example/welcome/index.ftl
index 5b9260707e..004b6b3260 100755
--- a/examples/themes/src/main/resources/theme/logo-example/welcome/index.ftl
+++ b/examples/themes/src/main/resources/theme/logo-example/welcome/index.ftl
@@ -37,7 +37,7 @@
 
         <p><a href="http://www.keycloak.org">Keycloak Project</a> |
             <a href="https://groups.google.com/forum/#!forum/keycloak-user">Mailing List</a> |
-            <a href="https://issues.jboss.org/browse/KEYCLOAK">Report an issue</a></p>
+            <a href="https://github.com/keycloak/keycloak/issues">Report an issue</a></p>
     </div>
 </div>
 </body>
diff --git a/themes/src/main/resources/theme/keycloak/welcome/index.ftl b/themes/src/main/resources/theme/keycloak/welcome/index.ftl
index 69499b3185..8bf272f22f 100755
--- a/themes/src/main/resources/theme/keycloak/welcome/index.ftl
+++ b/themes/src/main/resources/theme/keycloak/welcome/index.ftl
@@ -120,7 +120,7 @@
             <h3><a href="https://groups.google.com/forum/#!forum/keycloak-user"><img src="welcome-content/mail.png">Mailing List <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
           </div>
           <div class="card-pf h-m">
-            <h3><a href="https://issues.jboss.org/browse/KEYCLOAK"><img src="welcome-content/bug.png">Report an issue <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
+            <h3><a href="https://github.com/keycloak/keycloak/issues"><img src="welcome-content/bug.png">Report an issue <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
           </div>
         </#if>
         </div>