diff --git a/api/chalicelib/core/authorizers.py b/api/chalicelib/core/authorizers.py
index 899fd046f..5756e82ab 100644
--- a/api/chalicelib/core/authorizers.py
+++ b/api/chalicelib/core/authorizers.py
@@ -13,9 +13,9 @@ def jwt_authorizer(token):
     try:
         payload = jwt.decode(
             token[1],
-            "",
+            config("jwt_secret"),
             algorithms=config("jwt_algorithm"),
-            audience=[ f"front:default-foss"]
+            audience=[f"plugin:{helper.get_stage_name()}", f"front:{helper.get_stage_name()}"]
         )
     except jwt.ExpiredSignatureError:
         print("! JWT Expired signature")
@@ -42,7 +42,7 @@ def generate_jwt(id, tenant_id, iat, aud):
         payload={
             "userId": id,
             "tenantId": tenant_id,
-            "exp": iat // 1000 + config("jwt_exp_delta_seconds",cast=int) + TimeUTC.get_utc_offset() // 1000,
+            "exp": iat // 1000 + config("jwt_exp_delta_seconds", cast=int) + TimeUTC.get_utc_offset() // 1000,
             "iss": config("jwt_issuer"),
             "iat": iat // 1000,
             "aud": aud
diff --git a/api/chalicelib/core/projects.py b/api/chalicelib/core/projects.py
index 3559f645a..e4ac36ad8 100644
--- a/api/chalicelib/core/projects.py
+++ b/api/chalicelib/core/projects.py
@@ -244,7 +244,8 @@ def get_project_key(project_id):
                     where project_id =%(project_id)s AND deleted_at ISNULL;""",
                         {"project_id": project_id})
         )
-        return cur.fetchone()["project_key"]
+        project = cur.fetchone()
+        return project["project_key"] if project is not None else None
 
 
 def get_capture_status(project_id):
diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py
index b4ac0f869..ceada34f8 100644
--- a/api/chalicelib/core/users.py
+++ b/api/chalicelib/core/users.py
@@ -571,7 +571,6 @@ def auth_exists(user_id, tenant_id, jwt_iat, jwt_aud):
                     )
 
 
-@dev.timed
 def authenticate(email, password, for_change_password=False, for_plugin=False):
     with pg_client.PostgresClient() as cur:
         query = cur.mogrify(
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index 488fab072..0c649b68e 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -242,6 +242,7 @@ Pipfile
 /auth/auth_apikey.py
 /auth/auth_jwt.py
 /build.sh
+/routers/base.py
 /routers/core.py
 /routers/crons/core_crons.py
 /routers/subs/dashboard.py
diff --git a/ee/api/chalicelib/core/projects.py b/ee/api/chalicelib/core/projects.py
index 3072f55a0..0f2b62cc9 100644
--- a/ee/api/chalicelib/core/projects.py
+++ b/ee/api/chalicelib/core/projects.py
@@ -257,7 +257,8 @@ def get_project_key(project_id):
                     where project_id =%(project_id)s AND deleted_at ISNULL;""",
                         {"project_id": project_id})
         )
-        return cur.fetchone()["project_key"]
+        project = cur.fetchone()
+        return project["project_key"] if project is not None else None
 
 
 def get_capture_status(project_id):
diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index 9ca77c1ea..b70f6a269 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -632,7 +632,6 @@ def change_jwt_iat(user_id):
         return cur.fetchone().get("jwt_iat")
 
 
-@dev.timed
 def authenticate(email, password, for_change_password=False, for_plugin=False):
     with pg_client.PostgresClient() as cur:
         query = cur.mogrify(
diff --git a/ee/api/routers/base.py b/ee/api/routers/base.py
deleted file mode 100644
index 5c665b2d1..000000000
--- a/ee/api/routers/base.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from fastapi import APIRouter, Depends
-
-from auth.auth_apikey import APIKeyAuth
-from auth.auth_jwt import JWTAuth
-from auth.auth_project import ProjectAuthorizer
-from or_dependencies import ORRoute
-
-
-def get_routers() -> (APIRouter, APIRouter, APIRouter):
-    public_app = APIRouter(route_class=ORRoute)
-    app = APIRouter(dependencies=[Depends(JWTAuth()), Depends(ProjectAuthorizer("projectId"))], route_class=ORRoute)
-    app_apikey = APIRouter(dependencies=[Depends(APIKeyAuth()), Depends(ProjectAuthorizer("projectKey"))],
-                           route_class=ORRoute)
-    return public_app, app, app_apikey