diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23fcf9e1..ce195e42 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,35 +1,58 @@
-version: 2
+version: 2.1
+
 jobs:
-  "Test against Ruby 2.4":
-    docker:
-      - image: circleci/ruby:2.4.9
-    working_directory: ~/intercom-ruby
-    steps:
-      - checkout
-      - run: bundle install
-      - run: bundle exec rake
-  "Test against Ruby 2.5":
+  test:
+    parameters:
+      ruby_version:
+        type: string
     docker:
-      - image: circleci/ruby:2.5.7
+      - image: cimg/ruby:<< parameters.ruby_version >>
     working_directory: ~/intercom-ruby
     steps:
       - checkout
-      - run: bundle install
-      - run: bundle exec rake
-  "Test against Ruby 2.6":
-    docker:
-      - image: circleci/ruby:2.6.5
-    working_directory: ~/intercom-ruby
-    steps:
-      - checkout
-      - run: bundle install
-      - run: bundle exec rake
+
+      - restore_cache:
+          keys:
+            - bundler-<< parameters.ruby_version >>-{{ checksum "Gemfile.lock" }}
+
+      - run:
+          name: Install correct Bundler version (2.4.22)
+          command: |
+            gem uninstall bundler -a -x || true
+            gem install bundler -v 2.4.22
+
+      - run:
+          name: Install dependencies
+          command: |
+            bundle _2.6.6_ install --jobs=4 --retry=3
+
+      - save_cache:
+          key: bundler-<< parameters.ruby_version >>-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+
+      - run:
+          name: Run tests
+          command: bundle _2.6.6_ exec rake
 
 workflows:
-  version: 2
   build_and_test:
     jobs:
-      - "Test against Ruby 2.4"
-      - "Test against Ruby 2.5"
-      - "Test against Ruby 2.6"
-
+      - test:
+          name: "Test against Ruby 2.4"
+          ruby_version: "2.4"
+      - test:
+          name: "Test against Ruby 2.5"
+          ruby_version: "2.5"
+      - test:
+          name: "Test against Ruby 2.6"
+          ruby_version: "2.6"
+      - test:
+          name: "Test against Ruby 3.1"
+          ruby_version: "3.1"
+      - test:
+          name: "Test against Ruby 3.2"
+          ruby_version: "3.2"
+      - test:
+          name: "Test against Ruby 3.3"
+          ruby_version: "3.3"
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..cee821df
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/" # Root of the repo, where Gemfile and intercom.gemspec are
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    commit-message:
+      prefix: "chore"
diff --git a/.gitignore b/.gitignore
index c55233b6..ef916796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ doc
 *.gem
 *.iml
 .bundle
-Gemfile.lock
 pkg/*
 .rakeTasks
 .yardoc
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..4c0eb382
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    intercom (4.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    bigdecimal (3.1.9)
+    coderay (1.1.3)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    fakeweb (1.3.0)
+    gem-release (2.2.4)
+    hashdiff (1.1.2)
+    m (1.5.1)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    mocha (1.16.1)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (6.0.1)
+    rake (10.5.0)
+    rexml (3.4.1)
+    webmock (3.25.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  arm64-darwin-24
+
+DEPENDENCIES
+  fakeweb (~> 1.3)
+  gem-release
+  intercom!
+  jruby-openssl
+  m (~> 1.5.0)
+  minitest (~> 5.4)
+  mocha (~> 1.0)
+  pry
+  rake (~> 10.3)
+  webmock
+
+BUNDLED WITH
+   2.4.22