diff --git a/{{cookiecutter.project_slug}}/Gemfile b/{{cookiecutter.project_slug}}/Gemfile
index e236e3f..7d5e765 100644
--- a/{{cookiecutter.project_slug}}/Gemfile
+++ b/{{cookiecutter.project_slug}}/Gemfile
@@ -15,7 +15,9 @@ gem 'rubocop-rspec', ['>=2.10.0']
 # ensure version with branch coverage
 gem 'simplecov', ['>=0.18.0']
 gem 'simplecov-lcov'
-gem 'solargraph', ['>=0.50.0']
+gem 'solargraph',
+    git: 'https://github.com/apiology/solargraph',
+    branch: 'fix_kwarg_typecheck_issue'
 gem 'undercover'
 gem 'webmock'
 gem 'yard'
diff --git a/{{cookiecutter.project_slug}}/Gemfile.lock b/{{cookiecutter.project_slug}}/Gemfile.lock
index 27b0ddb..49b6da0 100644
--- a/{{cookiecutter.project_slug}}/Gemfile.lock
+++ b/{{cookiecutter.project_slug}}/Gemfile.lock
@@ -1,3 +1,25 @@
+GIT
+  remote: https://github.com/apiology/solargraph
+  revision: 19b24769041fa8aaa2c368f787c757f2b244371b
+  branch: fix_kwarg_typecheck_issue
+  specs:
+    solargraph (0.50.1)
+      backport (~> 1.2)
+      benchmark
+      bundler (~> 2.0)
+      diff-lcs (~> 1.4)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -9,7 +31,8 @@ GEM
     bigdecimal (3.1.8)
     chef-utils (18.5.0)
       concurrent-ruby
-    childprocess (4.1.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     concurrent-ruby (1.3.4)
     crack (1.0.0)
       bigdecimal
@@ -28,6 +51,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
+    logger (1.6.1)
     mdl (0.13.0)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
@@ -45,8 +69,9 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    overcommit (0.61.0)
-      childprocess (>= 0.6.3, < 5)
+    ostruct (0.6.0)
+    overcommit (0.64.0)
+      childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
     parallel (1.26.3)
@@ -63,8 +88,7 @@ GEM
     regexp_parser (2.9.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -103,24 +127,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.50.0)
-      backport (~> 1.2)
-      benchmark
-      bundler (~> 2.0)
-      diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.1)
-      parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
-      rubocop (~> 1.38)
-      thor (~> 1.0)
-      tilt (~> 2.0)
-      yard (~> 0.9, >= 0.9.24)
     source_finder (3.2.1)
-    strscan (3.1.0)
     thor (1.3.2)
     tilt (2.4.0)
     tomlrb (2.0.3)
@@ -146,7 +153,8 @@ PLATFORMS
 
 DEPENDENCIES
   mdl
-  overcommit (>= 0.61.0, < 0.62.0)
+  ostruct
+  overcommit (>= 0.64.0, < 0.65.0)
   punchlist
   rake
   rspec
@@ -155,7 +163,7 @@ DEPENDENCIES
   rubocop-rspec (>= 2.10.0)
   simplecov (>= 0.18.0)
   simplecov-lcov
-  solargraph (>= 0.50.0)
+  solargraph!
   undercover
   webmock
   yard