diff --git a/.github/workflows/eol.yml b/.github/workflows/eol.yml
index 250163e..f0746b9 100644
--- a/.github/workflows/eol.yml
+++ b/.github/workflows/eol.yml
@@ -37,11 +37,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.2, 2.3, 2.4, 2.5]
+        ruby: [2.2, 2.3, 2.4, 2.5, 2.6]
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
       BUNDLE_GEMFILE: gemfiles/eol.gemfile
+      # To avoid installing ruby-next with all the transpiling deps
+      RELEASING_PACO: true
       CI: true
       EOL: true
     steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d91c572..2aa84a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,12 +14,12 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - "3.2"
+          - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
           - "jruby"
           - "truffleruby"
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ee48fba
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+default: test
+
+nextify:
+	bundle exec rake nextify
+
+test: nextify
+	bundle exec rake
+	CI=true bundle exec rake
+
+lint:
+	bundle exec rubocop
+
+release: test lint
+	git status
+	RELEASING_PACO=true gem release -t
+	git push
+	git push --tags
diff --git a/paco.gemspec b/paco.gemspec
index 0117351..833e1c0 100644
--- a/paco.gemspec
+++ b/paco.gemspec
@@ -27,4 +27,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "ruby-next-core", ">= 0.15.0"
+
+  # When gem is installed from source, we add `ruby-next` as a dependency
+  # to auto-transpile source files during the first load
+  if ENV["RELEASING_PACO"].nil? && File.directory?(File.join(__dir__, ".git"))
+    spec.add_runtime_dependency "ruby-next", ">= 0.15.0"
+  else
+    spec.add_runtime_dependency "ruby-next-core", ">= 0.15.0"
+  end
 end