diff --git a/.github/workflows/create-test-matrix.ps1 b/.github/workflows/create-test-matrix.ps1
index 8ac72582..d635d89e 100644
--- a/.github/workflows/create-test-matrix.ps1
+++ b/.github/workflows/create-test-matrix.ps1
@@ -3,7 +3,7 @@ param([Switch]$Raw)
 $Jobs = @()
 
 # All default OSes we test on
-$OSList =@('ubuntu-latest', 'windows-latest')
+$OSList =@('ubuntu-20.04', 'windows-2019')
 # All default Ruby and Puppet combinations
 # Pin to Ruby 2.5.8 due to
 #  - https://github.com/chef/win32-dir/commit/cf3e31ec90e47d988840759e5d755a9460e192ff
diff --git a/puppet-languageserver b/puppet-languageserver
index 8fd741e1..fb4d584a 100755
--- a/puppet-languageserver
+++ b/puppet-languageserver
@@ -2,11 +2,12 @@
 # frozen_string_literal: true
 
 # Add the language server into the load path
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+$LOAD_PATH.unshift(File.join(__dir__, 'lib'))
+
 # Add the vendored gems into the load path
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor', 'puppet-lint', 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor', 'molinillo', 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor', 'puppetfile-resolver', 'lib'))
+$LOAD_PATH.unshift(File.join(__dir__, 'vendor', 'puppet-lint', 'lib'))
+$LOAD_PATH.unshift(File.join(__dir__, 'vendor', 'molinillo', 'lib'))
+$LOAD_PATH.unshift(File.join(__dir__, 'vendor', 'puppetfile-resolver', 'lib'))
 
 require 'puppet_languageserver'