diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index ca997aaae4..95bd11dc94 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -11,6 +11,9 @@ parameter_defaults:
   # ensure we enable ip_forward before docker gets run
   KernelIpForward: 1
   KeystoneCorsAllowedOrigin: '*'
+  # Increase the Token expiration time until we fix the actual session bug:
+  # https://bugs.launchpad.net/tripleo/+bug/1761050
+  TokenExpiration: 14400
   EnablePackageInstall: true
   StackAction: CREATE
   SoftwareConfigTransport: POLL_SERVER_HEAT
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 0ff3415eec..97bd775630 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -109,6 +109,10 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
+  TokenExpiration:
+    default: 3600
+    description: Set a token expiration time in seconds.
+    type: number
   KeystoneWorkers:
     type: string
     description: Set the number of workers for keystone::wsgi::apache
@@ -349,6 +353,7 @@ outputs:
                 query:
                   read_default_file: /etc/my.cnf.d/tripleo.cnf
                   read_default_group: tripleo
+            keystone::token_expiration: {get_param: TokenExpiration}
             keystone::admin_token: {get_param: AdminToken}
             keystone::admin_password: {get_param: AdminPassword}
             keystone::roles::admin::password: {get_param: AdminPassword}