diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9f4ce1a3f..ea2e512c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.6.0-node-browsers
+      - image: circleci/ruby:2.6.3-node-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -57,16 +57,11 @@ jobs:
       #     name: brakeman
       #     command: brakeman
 
-      # - run:
-      #     name: Copy files
-      #     command: |
-      #       cp shared/config/database.yml config/database.yml
-      #       cp shared/config/application.yml config/application.yml
-
-      # Run rails tests
-      - type: shell
-        command: |
-          rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+      - run:
+          name: Copy files
+          command: |
+            cp shared/config/database.yml config/database.yml
+            cp shared/config/application.yml config/application.yml
 
       # Store yarn / webpacker cache
       - save_cache:
diff --git a/.ruby-version b/.ruby-version
index e70b4523a..ec1cf33c3 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.0
+2.6.3
diff --git a/Gemfile b/Gemfile
index f29d36675..b1246cb6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '2.6.0'
+ruby '2.6.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6', github: 'rails/rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index ceb423c64..89ed357df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 88fe8d9e7ca687f4253090bcc2c634595a19d203
+  revision: 4a2746db1c92d0bf246e938b872b233a64f0a18b
   specs:
     actioncable (6.1.0.alpha)
       actionpack (= 6.1.0.alpha)
@@ -81,11 +81,11 @@ GIT
 
 GIT
   remote: https://github.com/lynndylanhurley/devise_token_auth
-  revision: 2c3a8d83304062523899764ae695d8e5bdc74269
+  revision: b6915aa1bd12e28236ef6e9821a29fba5c5039d2
   specs:
     devise_token_auth (1.1.1)
       bcrypt (~> 3.0)
-      devise (> 3.5.2, < 4.7)
+      devise (> 3.5.2, < 5)
       rails (>= 4.2.0, < 6.1)
 
 GIT
@@ -97,9 +97,9 @@ GIT
 
 GIT
   remote: https://github.com/plataformatec/devise
-  revision: 12fc5b76d89cf6e9c47289416fb24bf1a85f03da
+  revision: 6bb74c5abff9f75e992560b308b1f8ae926da50e
   specs:
-    devise (4.6.2)
+    devise (4.7.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -113,8 +113,8 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.203.0)
-    aws-sdk-core (3.63.0)
+    aws-partitions (1.206.0)
+    aws-sdk-core (3.64.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
@@ -193,6 +193,7 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashie (3.6.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httparty (0.17.0)
@@ -297,7 +298,7 @@ GEM
     rack-cache (1.9.0)
       rack (>= 0.4)
     rack-cors (1.0.3)
-    rack-protection (2.0.5)
+    rack-protection (2.0.7)
       rack
     rack-proxy (0.6.5)
       rack
@@ -326,7 +327,8 @@ GEM
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -493,7 +495,7 @@ DEPENDENCIES
   wisper (= 2.0.0)
 
 RUBY VERSION
-   ruby 2.6.0p0
+   ruby 2.6.3p62
 
 BUNDLED WITH
    1.17.3
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index 7950893f7..fe24e4b15 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -1,7 +1,7 @@
-require "redis"
-
 #for reports
-redis = Redis.new(url: ENV['REDIS_URL'])
+#TODO fix the redis config
+uri = URI.parse("redis://localhost:6379")
+redis = Redis.new(:url => uri)
 Nightfury.redis = Redis::Namespace.new("reports", redis: redis)
 
 =begin
diff --git a/shared/config/database.yml b/shared/config/database.yml
index 352dbd9ba..e7244732b 100644
--- a/shared/config/database.yml
+++ b/shared/config/database.yml
@@ -12,6 +12,8 @@ development:
 
 test:
   <<: *default
+  username: postgres
+  password:
   database: chatwoot_test
 
 production: