diff --git a/config/prod.exs b/config/prod.exs
index feb86d278..f366dbe69 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -18,7 +18,7 @@ config :challenge_gov, Web.Endpoint,
 
 config :challenge_gov, ChallengeGov.Repo,
   url: System.get_env("DATABASE_URL"),
-  ssl: [verify: :verify_none],
+  ssl: if(System.get_env("DATABASE_SSL") == "true", do: [verify: :verify_none], else: false),
   pool_size: String.to_integer(System.get_env("POOL_SIZE") || "15"),
   loggers: [{LoggerJSON.Ecto, :log, [:info]}]
 
diff --git a/mix.exs b/mix.exs
index 60076e610..b1af805c7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -75,7 +75,7 @@ defmodule ChallengeGov.MixProject do
       {:plug_cowboy, "~> 2.0"},
       {:poison, "~> 3.0"},
       {:porcelain, "~> 2.0"},
-      {:postgrex, ">= 0.0.0"},
+      {:postgrex, ">= 0.0.0", override: true},
       {:quantum, "~> 3.5.3"},
       {:remote_ip, "~> 0.2.0"},
       {:sobelow, "~> 0.11"},