diff --git a/src/injection/Injector.ts b/src/injection/Injector.ts
index 70839c3..4abaa25 100644
--- a/src/injection/Injector.ts
+++ b/src/injection/Injector.ts
@@ -95,8 +95,10 @@ export function injectUser() {
  */
 export function injectUserForBuildTrigger() {
     return function (req: Request, res: Response, next: NextFunction) {
-        const token = req.query.token as string
-        const namespace = req.query.namespace as string
+        const locals = res.locals
+
+        const token = req.header(CaptainConstants.headerAppToken) as string
+        const namespace = locals.namespace
         const appName = req.params.appName as string
 
         if (!token || !namespace || !appName) {
diff --git a/src/utils/CaptainConstants.ts b/src/utils/CaptainConstants.ts
index 578a350..7c9f42e 100644
--- a/src/utils/CaptainConstants.ts
+++ b/src/utils/CaptainConstants.ts
@@ -157,6 +157,8 @@ let data = {
 
     headerAuth: 'x-captain-auth',
 
+    headerAppToken: 'x-captain-app-token',
+
     headerNamespace: 'x-namespace',
 
     // *********************     ETC       ************************