diff --git a/apps/andi/config/integration.exs b/apps/andi/config/integration.exs
index 776cb3b90..4fdd94c8e 100644
--- a/apps/andi/config/integration.exs
+++ b/apps/andi/config/integration.exs
@@ -1,7 +1,7 @@
 use Mix.Config
 
 System.put_env("AUTH0_DOMAIN", "urbanos-dev.us.auth0.com")
-System.put_env("AUTH0_CLIENT_ID", "oRb8LbGixCD7a6T7u3sTx1Ve65nL2hWa")
+System.put_env("ANDI_AUTH0_CLIENT_ID", "oRb8LbGixCD7a6T7u3sTx1Ve65nL2hWa")
 System.put_env("SECURE_COOKIE", "false")
 System.put_env("REQUIRE_ADMIN_API_KEY", "false")
 System.put_env("RAPTOR_URL", "http://localhost:4002")
diff --git a/apps/andi/lib/andi/application.ex b/apps/andi/lib/andi/application.ex
index ec19767a4..18d3a77ea 100644
--- a/apps/andi/lib/andi/application.ex
+++ b/apps/andi/lib/andi/application.ex
@@ -112,7 +112,7 @@ defmodule Andi.Application do
   def set_auth0_credentials() do
     Application.put_env(:ueberauth, Ueberauth.Strategy.Auth0.OAuth,
       domain: get_env_variable("AUTH0_DOMAIN", false),
-      client_id: get_env_variable("AUTH0_CLIENT_ID", false),
+      client_id: get_env_variable("ANDI_AUTH0_CLIENT_ID", false),
       client_secret: get_env_variable("AUTH0_CLIENT_SECRET", false)
     )
   end
diff --git a/apps/andi/mix.exs b/apps/andi/mix.exs
index b9aa504c4..cce76dcdb 100644
--- a/apps/andi/mix.exs
+++ b/apps/andi/mix.exs
@@ -4,7 +4,7 @@ defmodule Andi.MixProject do
   def project do
     [
       app: :andi,
-      version: "2.6.78",
+      version: "2.7.0",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
diff --git a/apps/raptor/config/integration.exs b/apps/raptor/config/integration.exs
index 3ad849e26..7833d85f7 100644
--- a/apps/raptor/config/integration.exs
+++ b/apps/raptor/config/integration.exs
@@ -1,7 +1,7 @@
 use Mix.Config
 
 System.put_env("AUTH0_DOMAIN", "urbanos-dev.us.auth0.com")
-System.put_env("AUTH0_CLIENT_ID", "oRb8LbGixCD7a6T7u3sTx1Ve65nL2hWa")
+System.put_env("RAPTOR_AUTH0_CLIENT_ID", "oRb8LbGixCD7a6T7u3sTx1Ve65nL2hWa")
 
 host = "localhost"
 endpoints = [{to_charlist(host), 9092}]
@@ -9,7 +9,7 @@ redix_args = [host: host]
 
 config :ueberauth, Ueberauth.Strategy.Auth0.OAuth,
   domain: System.get_env("AUTH0_DOMAIN"),
-  client_id: System.get_env("AUTH0_CLIENT_ID"),
+  client_id: System.get_env("RAPTOR_AUTH0_CLIENT_ID"),
   client_secret: System.get_env("AUTH0_CLIENT_SECRET")
 
 config :raptor, :auth0,
diff --git a/apps/raptor/lib/raptor/application.ex b/apps/raptor/lib/raptor/application.ex
index 3b5525488..2bd894f6b 100644
--- a/apps/raptor/lib/raptor/application.ex
+++ b/apps/raptor/lib/raptor/application.ex
@@ -72,7 +72,7 @@ defmodule Raptor.Application do
   def set_auth0_credentials() do
     Application.put_env(:ueberauth, Ueberauth.Strategy.Auth0.OAuth,
       domain: get_env_variable("AUTH0_DOMAIN", false),
-      client_id: get_env_variable("AUTH0_CLIENT_ID", false),
+      client_id: get_env_variable("RAPTOR_AUTH0_CLIENT_ID", false),
       client_secret: get_env_variable("AUTH0_CLIENT_SECRET", false)
     )
   end
diff --git a/apps/raptor/mix.exs b/apps/raptor/mix.exs
index 2921763c8..2c7e5fb74 100644
--- a/apps/raptor/mix.exs
+++ b/apps/raptor/mix.exs
@@ -5,7 +5,7 @@ defmodule Raptor.MixProject do
     [
       app: :raptor,
       compilers: [:phoenix] ++ Mix.compilers(),
-      version: "1.2.18",
+      version: "1.3.0",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",