diff --git a/.gitignore b/.gitignore
index 2ed5d4a..e80e7c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ npm-debug.log*
 /client-secret-staging.json
 /node_modules/
 /public/_client/
+/secrets.tar
 /secret_key
 /server.js
 /tokens/
diff --git a/.travis.yml b/.travis.yml
index 660525f..76ba5cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,8 @@ env:
   - secure: rrZwddgjDOdZj81JRQ6Z+PWEGodJG4FcWk+BOkfF7HrMKK30ZAQwjJWAxb33OrhGLrZ2QFVoAD4kbMYlV8oo/OBtiXHgR2Xv1JKW74VF7r+VdKk4MGvuqXuprbauRfJYnR0aAH16H/l0+dKLtma4FL7moD33f7+UYac8xRRKC9dFsT8xxxfznTpqTP2loDZPsBJ+EaCzWGK2n/wTegGirxVHcS/dAj6yN6EIdAr+ekAgzGtqIaRAVYkGW3qRvz8FXA0PRzZopgBrLcAaWpot9yDIaS0K+vrVNF05fWF5CPP8ygOjd7I04DsoGd4S/5aW45yALxIasElZCMWesrcmNL/fCn+BFolJQY/aoZVqiOiL6h3u7/OLL6gOwXeJhLx/qMS3WcaeoudzhpjMg9q6urgA9FrViCdY21CoFcRxw8ZFXi92CFx3c2Tn8QoFLumHHOS9F8ZJ0t+EMC6fJ6kS2P+GWO6Iwvt+ONOeB88ZnzIViyH66y43+i/Zrqzs28KW5i7sTcrx3zFQrEuWCLS6jMhWYsesvi/hsqfWlvMu3c9V6YxNSgZJHtmlpXN4Bq28chS3S5YVr2pV5rmLywSchcfmJgQoPikPwJ8qinm0egnmr/ukOcKELtaSTlPz+tZL/tVjwC6Qkzh4ELzVxmX1wWZGJgERFHEUHuC2LeXnn94=
 before_install:
 - openssl aes-256-cbc -K $encrypted_a35d52d190dd_key -iv $encrypted_a35d52d190dd_iv
-  -in client-secret-staging.json.enc -out client-secret-staging.json -d
-- openssl aes-256-cbc -K $encrypted_a35d52d190dd_key -iv $encrypted_a35d52d190dd_iv
-  -in secret_key.enc -out secret_key -d
+  -in secrets.tar.enc -out secrets.tar -d
+- tar xvf secrets.tar
 script:
 - npm run lint
 - NODE_ENV=$([ "$TRAVIS_BRANCH" == "master" ] && echo "production" || echo "staging")
@@ -18,8 +17,8 @@ script:
 deploy:
 - provider: gae
   skip_cleanup: true
-  project: unpkg-staging
   keyfile: client-secret-staging.json
+  project: unpkg-staging
   on:
     branch: gae-staging
 - provider: script
diff --git a/client-secret-staging.json.enc b/client-secret-staging.json.enc
deleted file mode 100644
index 1676078..0000000
Binary files a/client-secret-staging.json.enc and /dev/null differ
diff --git a/secret_key.enc b/secret_key.enc
deleted file mode 100644
index f47bdf5..0000000
Binary files a/secret_key.enc and /dev/null differ
diff --git a/secrets.tar.enc b/secrets.tar.enc
new file mode 100644
index 0000000..9dc7a92
Binary files /dev/null and b/secrets.tar.enc differ