diff --git a/CHANGELOG b/CHANGELOG
index 3ef46f4484..25067d3abe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 6.8.0
   - Fix download link for huge MR diffs
   - Expose event and mergerequest timestamps in API
   - Fix emails on push service when only one commit is pushed
+  - Store Rails cache data in the Redis `cache:gitlab` namespace
 
 v 6.7.3
   - Fix the merge notification email not being sent (Pierre de La Morinerie)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ad3c03d8fc..47f7e17aeb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -53,7 +53,7 @@ Gitlab::Application.configure do
                else
                  "redis://localhost:6379"
                end
-  config.cache_store = :redis_store, resque_url
+  config.cache_store = :redis_store, resque_url, {namespace: 'cache:gitlab'}
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index f80b67a554..5fe5270236 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,7 +2,7 @@
 
 Gitlab::Application.config.session_store(
   :redis_store, # Using the cookie_store would enable session replay attacks.
-  servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store
+  servers: Gitlab::Application.config.cache_store[1], # re-use the Redis config from the Rails cache store
   key: '_gitlab_session',
   secure: Gitlab.config.gitlab.https,
   httponly: true,