diff --git a/.gitignore b/.gitignore
index e80e7c3..4becf36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,11 @@ firebase-debug.log*
 npm-debug.log*
 
 /.env
-/client-secret-staging.json
 /node_modules/
 /public/_client/
 /secrets.tar
 /secret_key
 /server.js
+/service-account-staging.json
+/service-account.json
 /tokens/
diff --git a/.travis.yml b/.travis.yml
index 76ba5cc..90fc6b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,21 @@ before_install:
 - tar xvf secrets.tar
 script:
 - npm run lint
-- NODE_ENV=$([ "$TRAVIS_BRANCH" == "master" ] && echo "production" || echo "staging")
+- NODE_ENV=$(([ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == "gae" ]) && echo "production" || echo "staging")
   npm run build
 deploy:
 - provider: gae
   skip_cleanup: true
-  keyfile: client-secret-staging.json
+  keyfile: service-account-staging.json
   project: unpkg-staging
   on:
     branch: gae-staging
+- provider: gae
+  skip_cleanup: true
+  keyfile: service-account.json
+  project: unpkg-gcp
+  on:
+    branch: gae
 - provider: script
   skip_cleanup: true
   script: $(npm bin -g)/firebase deploy --project unpkg-staging --message "https://travis-ci.org/$TRAVIS_REPO_SLUG/builds/$TRAVIS_BUILD_ID"
diff --git a/secrets.tar.enc b/secrets.tar.enc
index 9dc7a92..74b46ff 100644
Binary files a/secrets.tar.enc and b/secrets.tar.enc differ