diff --git a/.devcontainer/scripts/setup.sh b/.devcontainer/scripts/setup.sh
index 6030d93b1..1b5842603 100755
--- a/.devcontainer/scripts/setup.sh
+++ b/.devcontainer/scripts/setup.sh
@@ -3,3 +3,6 @@ sed -i -e '/REDIS_URL/ s/=.*/=redis:\/\/localhost:6379/' .env
 sed -i -e '/POSTGRES_HOST/ s/=.*/=localhost/' .env
 sed -i -e '/SMTP_ADDRESS/ s/=.*/=localhost/' .env
 sed -i -e "/FRONTEND_URL/ s/=.*/=https:\/\/$CODESPACE_NAME-3000.githubpreview.dev/" .env
+sed -i -e "/WEBPACKER_DEV_SERVER_PUBLIC/ s/=.*/=https:\/\/$CODESPACE_NAME-3035.githubpreview.dev/" .env
+# uncomment the webpacker env variable
+sed -i -e '/WEBPACKER_DEV_SERVER_PUBLIC/s/^# //' .env
diff --git a/.env.example b/.env.example
index 08e72816e..6dffe6b38 100644
--- a/.env.example
+++ b/.env.example
@@ -155,3 +155,5 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## Development Only Config
 # if you want to use letter_opener for local emails
 # LETTER_OPENER=true
+# meant to be used in github codespaces
+# WEBPACKER_DEV_SERVER_PUBLIC=
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 3e7b50bc2..6ffa15172 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -7,7 +7,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   sort_on :last_activity_at, type: :datetime
 
   RESULTS_PER_PAGE = 15
-  protect_from_forgery with: :null_session
 
   before_action :check_authorization
   before_action :set_current_page, only: [:index, :active, :search]
diff --git a/app/controllers/api/v1/accounts/custom_filters_controller.rb b/app/controllers/api/v1/accounts/custom_filters_controller.rb
index 169b6cd1e..e6c7b6857 100644
--- a/app/controllers/api/v1/accounts/custom_filters_controller.rb
+++ b/app/controllers/api/v1/accounts/custom_filters_controller.rb
@@ -1,5 +1,4 @@
 class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
-  protect_from_forgery with: :null_session
   before_action :fetch_custom_filters, except: [:create]
   before_action :fetch_custom_filter, only: [:show, :update, :destroy]
   DEFAULT_FILTER_TYPE = 'conversation'.freeze
diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 8f63d79f5..ef08be6d9 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -1,7 +1,6 @@
 class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseController
   RESULTS_PER_PAGE = 15
 
-  protect_from_forgery with: :null_session
   before_action :fetch_notification, only: [:update]
   before_action :set_primary_actor, only: [:read_all]
   before_action :set_current_page, only: [:index]
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index f67972486..0cfc12445 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -1,7 +1,6 @@
 class Api::V1::AccountsController < Api::BaseController
   include AuthHelper
 
-  skip_before_action :verify_authenticity_token, only: [:create]
   skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
                      only: [:create], raise: false
   before_action :check_signup_enabled, only: [:create]
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4fe48998d..9399771c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,13 +3,12 @@ class ApplicationController < ActionController::Base
   include Pundit
   include SwitchLocale
 
-  protect_from_forgery with: :null_session
+  skip_before_action :verify_authenticity_token
 
   before_action :set_current_user, unless: :devise_controller?
   around_action :switch_locale
   around_action :handle_with_exception, unless: :devise_controller?
 
-  # after_action :verify_authorized
   rescue_from ActiveRecord::RecordInvalid, with: :render_record_invalid
 
   private
diff --git a/app/controllers/platform_controller.rb b/app/controllers/platform_controller.rb
index 612f86d27..c1ecfc500 100644
--- a/app/controllers/platform_controller.rb
+++ b/app/controllers/platform_controller.rb
@@ -1,6 +1,4 @@
-class PlatformController < ActionController::Base
-  protect_from_forgery with: :null_session
-
+class PlatformController < ActionController::API
   before_action :ensure_access_token
   before_action :set_platform_app
   before_action :set_resource, only: [:update, :show, :destroy]
diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb
index 615a5d610..9e5a7e6ba 100644
--- a/app/controllers/public_controller.rb
+++ b/app/controllers/public_controller.rb
@@ -1,3 +1,5 @@
+# TODO: we should switch to ActionController::API for the base classes
+# One of the specs is failing when I tried doing that, lets revisit in future
 class PublicController < ActionController::Base
   skip_before_action :verify_authenticity_token
 end
diff --git a/config/webpacker.yml b/config/webpacker.yml
index e96ffdca6..d7b7b3f5a 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -72,6 +72,8 @@ development:
     quiet: false
     headers:
       'Access-Control-Allow-Origin': '*'
+      'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS'
+      'Access-Control-Allow-Headers': 'X-Requested-With, content-type, Authorization'
     watch_options:
       ignored: '**/node_modules/**'
 
diff --git a/spec/controllers/platform/api/v1/public/api/v1/inbox/contacts_controller_spec.rb b/spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb
similarity index 100%
rename from spec/controllers/platform/api/v1/public/api/v1/inbox/contacts_controller_spec.rb
rename to spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb
diff --git a/spec/controllers/platform/api/v1/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
similarity index 100%
rename from spec/controllers/platform/api/v1/public/api/v1/inbox/conversations_controller_spec.rb
rename to spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
diff --git a/spec/controllers/platform/api/v1/public/api/v1/inbox/messages_controller_spec.rb b/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
similarity index 100%
rename from spec/controllers/platform/api/v1/public/api/v1/inbox/messages_controller_spec.rb
rename to spec/controllers/public/api/v1/inbox/messages_controller_spec.rb