diff --git a/lib/towerops/application.ex b/lib/towerops/application.ex
index aa25fd82..77f6acdb 100644
--- a/lib/towerops/application.ex
+++ b/lib/towerops/application.ex
@@ -102,7 +102,9 @@ defmodule Towerops.Application do
         node_name != :nonode@nohost
 
     if use_redis? do
-      {Phoenix.PubSub, name: Towerops.PubSub, adapter: Phoenix.PubSub.Redis, redis_config: redis_pubsub_config()}
+      base_config = [name: Towerops.PubSub, adapter: Phoenix.PubSub.Redis]
+      redis_opts = redis_pubsub_config()
+      {Phoenix.PubSub, Keyword.merge(base_config, redis_opts)}
     else
       # Default PG2 adapter for Mix tasks and development
       {Phoenix.PubSub, name: Towerops.PubSub}