diff --git a/.codeclimate.yml b/.codeclimate.yml
index 2fae629..8a53791 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -3,6 +3,3 @@ version: "2"
 plugins:
   bundler-audit:
     enabled: true
-  rubocop:
-    enabled: true
-    channel: rubocop-0-80
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f59d291..fbca046 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,6 +41,9 @@ jobs:
           bundle install -j $(nproc)
         env:
           BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: 'true'
+      
+      - name: Lint
+        run: bundle exec rake rubocop
 
       - name: Test
         run: bundle exec rake test_with_coverage
diff --git a/.rubocop.yml b/.rubocop.yml
index b14a9cb..99e322b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -430,9 +430,6 @@ Lint/EmptyInterpolation:
 Lint/EmptyWhen:
   Enabled: true
 
-Lint/EndInMethod:
-  Enabled: true
-
 Lint/EnsureReturn:
   Enabled: true
 
diff --git a/Gemfile b/Gemfile
index 28f726d..83d29ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ end
 
 group :test do
   gem "rspec", "~> 3.9.0"
-  gem "rubocop", "~> 0.80.1"
+  gem "rubocop", "~> 0.81.0"
   gem "rubocop-performance", "~> 1.5.2"
   gem "simplecov", "~> 0.18.5"
   gem "simplecov-console", "~> 0.7.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index f8f748c..8962e01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,14 +114,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.80.1)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
@@ -157,7 +157,7 @@ GEM
     tilt (2.0.10)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     uuid (2.3.9)
       macaddr (~> 1.0)
     yard (0.9.24)
@@ -176,7 +176,7 @@ DEPENDENCIES
   pry (~> 0.13.0)
   rake (~> 13.0.1)
   rspec (~> 3.9.0)
-  rubocop (~> 0.80.1)
+  rubocop (~> 0.81.0)
   rubocop-performance (~> 1.5.2)
   semantic (~> 1.6.1)
   simplecov (~> 0.18.5)