diff --git a/.travis.yml b/.travis.yml
index 393a47fdf..91e6c1841 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,8 @@ addons:
 
 install:
   - pip install poetry
-  - poetry install -vv
+  - poetry install -vv --no-interaction
+  - poetry show -vv
   - psql -c 'SELECT version();' -U postgres
   - psql -U postgres -c "create database fence_test_tmp"
   - pip list
diff --git a/README.md b/README.md
index 56ec488b7..165c5e5d7 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/41ff9d807efa4da8a733793b3539ba3e)](https://www.codacy.com/app/uc-cdis/fence?utm_source=github.com&utm_medium=referral&utm_content=uc-cdis/fence&utm_campaign=Badge_Grade)
 [![Coverage Status](https://coveralls.io/repos/github/uc-cdis/fence/badge.svg?branch=master)](https://coveralls.io/github/uc-cdis/fence?branch=master)
 
-
 A `fence` separates protected resources from the outside world and allows
 only trusted entities to enter.
 
@@ -600,4 +599,4 @@ Table contains various artifacts in fence that have temporary lifetimes and thei
 | Client SA (for User) Key             | 10 days      | FALSE       | N/A                   | Obtained by the user themselves for temp access. Can optionally provide an expiration less than 10 days                              |
 | User Primary SA Key                  | 10 days      | FALSE       | N/A                   | Used for Google URL signing                                                              |
 | User Primary SA Key for URL Signing  | 30 days      | FALSE       | N/A                   |                                                                                          |
-| Sliding Session Window               | 30 minutes   | TRUE        | 8 hours               | access_token cookies get generated automatically when expired if session is still active |
+| Sliding Session Window               | 15 minutes   | TRUE        | 8 hours               | access_token cookies get generated automatically when expired if session is still active |
diff --git a/fence/config-default.yaml b/fence/config-default.yaml
index 25001148a..0b9940058 100755
--- a/fence/config-default.yaml
+++ b/fence/config-default.yaml
@@ -390,6 +390,10 @@ APPLICATION_ROOT: '/user'
 # //////////////////////////////////////////////////////////////////////////////////////
 # Tokens, Lifetimes, & Expirations
 #   - Already contains reasonable defaults
+#
+#   WARNING: Some of these default times are strict external requirements for compliance
+#            of running Gen3 instances. DO NOT CHANGE WITHOUT CONSIDERING THE RAMIFICATIONS.
+#
 # //////////////////////////////////////////////////////////////////////////////////////
 # The name of the browser cookie in which the access token will be stored.
 ACCESS_TOKEN_COOKIE_NAME: "access_token"
@@ -414,7 +418,7 @@ ACCESS_TOKEN_EXPIRES_IN: 1200
 REFRESH_TOKEN_EXPIRES_IN: 2592000
 
 # The number of seconds after which a browser session is considered stale.
-SESSION_TIMEOUT: 1800
+SESSION_TIMEOUT: 900
 
 # The maximum session lifetime in seconds.
 SESSION_LIFETIME: 28800