diff --git a/web.py b/web.py
index 445c2fa5b..4c1a4f4c0 100644
--- a/web.py
+++ b/web.py
@@ -4,14 +4,15 @@ import logging.config
 from app import app as application
 
 from endpoints.api import api_bp
-from endpoints.web import web
-from endpoints.webhooks import webhooks
-from endpoints.realtime import realtime
-from endpoints.oauthlogin import oauthlogin
+from endpoints.bitbuckettrigger import bitbuckettrigger
 from endpoints.githubtrigger import githubtrigger
 from endpoints.gitlabtrigger import gitlabtrigger
-from endpoints.bitbuckettrigger import bitbuckettrigger
+from endpoints.key_server import key_server
+from endpoints.oauthlogin import oauthlogin
+from endpoints.realtime import realtime
 from endpoints.secscan import secscan
+from endpoints.web import web
+from endpoints.webhooks import webhooks
 
 if os.environ.get('DEBUGLOG') == 'true':
   logging.config.fileConfig('conf/logging_debug.conf', disable_existing_loggers=False)
@@ -25,3 +26,4 @@ application.register_blueprint(api_bp, url_prefix='/api')
 application.register_blueprint(webhooks, url_prefix='/webhooks')
 application.register_blueprint(realtime, url_prefix='/realtime')
 application.register_blueprint(secscan, url_prefix='/secscan')
+application.register_blueprint(key_server, url_prefix='/keys')