diff --git a/app/controllers/overrides/registrations_controller.rb b/app/controllers/overrides/registrations_controller.rb
new file mode 100644
index 0000000..8dc2fcf
--- /dev/null
+++ b/app/controllers/overrides/registrations_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Overrides
+  class RegistrationsController < DeviseTokenAuth::RegistrationsController
+    def render_create_success
+      render json: resource_data
+    end
+
+    def render_update_success
+      render json: resource_data
+    end
+  end
+end
diff --git a/app/controllers/overrides/sessions_controller.rb b/app/controllers/overrides/sessions_controller.rb
new file mode 100644
index 0000000..9006683
--- /dev/null
+++ b/app/controllers/overrides/sessions_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Overrides
+  class SessionsController < DeviseTokenAuth::SessionsController
+    def render_create_success
+      render json: resource_data(resource_json: @resource.token_validation_response)
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index e3097b6..bf135cb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  mount_devise_token_auth_for 'User', at: 'users'
+  mount_devise_token_auth_for 'User', at: 'users', controllers: {
+    registrations: 'overrides/registrations',
+    sessions: 'overrides/sessions'
+  }
 
   resources :matches, only: %i[show]
   resources :teams, only: %i[show update]