diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 84591b2a..bca21d22 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -28,7 +28,7 @@ class RegistrationsController < Devise::RegistrationsController
     return unless signed_in?
     return if params[:redir].blank?
 
-    redirect_to after_sign_up_path_for(current_user)
+    redirect_to after_sign_up_path_for(current_user), allow_other_host: true
   end
 
   def require_no_authentication
diff --git a/lib/docuseal.rb b/lib/docuseal.rb
index 27a4e655..a65a896d 100644
--- a/lib/docuseal.rb
+++ b/lib/docuseal.rb
@@ -13,19 +13,23 @@ module Docuseal
   HOST = ENV.fetch('HOST', 'localhost')
   CONSOLE_URL = if Rails.env.development?
                   'http://console.localhost.io:3001'
-                else
+                elsif ENV['MULTITENANT'] == 'true'
                   "https://console.#{HOST}"
+                else
+                  'https://console.docuseal.co'
                 end
   CDN_URL = if Rails.env.development?
               'http://localhost:3000'
-            else
+            elsif ENV['MULTITENANT'] == 'true'
               "https://cdn.#{HOST}"
+            else
+              'https://cdn.docuseal.co'
             end
 
   CERTS = JSON.parse(ENV.fetch('CERTS', '{}'))
 
   DEFAULT_URL_OPTIONS = {
-    host: ENV.fetch('HOST', 'localhost'),
+    host: HOST,
     protocol: ENV['FORCE_SSL'] == 'true' ? 'https' : 'http'
   }.freeze