diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index cc4675e5ddb912f2284a6741ec440ed812730d37..a719361689897b67e53c12da1c50e68c5b8c7dc8 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
-	]
+	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [],
diff --git a/.rubocop.yml b/.rubocop.yml
index 8f782e741528905cd59743f73283f8a39e9bf210..31e8248ff813e956702d5c67844aeb0e2affc917 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.5'
   Include:
   - "**/*.rb"
   Exclude:
diff --git a/Gemfile b/Gemfile
index 18272fd72e8b95feb3fe64e34a51a9b75a7af794..db6f7dde5ff2abe1653122bcfdb98c2b1375d431 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,13 +24,14 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-lint-absolute_classname-check", '3.0.1',           require: false
-  gem "puppet-lint-absolute_template_path", '1.0.1',             require: false
-  gem "puppet-lint-empty_trailing_lines", '0.0.1',               require: false
-  gem "puppet-lint-file_ensure-check", '1.0.0',                  require: false
-  gem "puppet-lint-strict_indent-check", '2.0.8',                require: false
-  gem "puppet-lint-trailing_comma-check", '0.4.2',               require: false
-  gem "puppet-lint-unquoted_string-check", '2.1.0',              require: false
+  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false
+  gem "puppet-lint-absolute_classname-check", '>= 3.0.1',        require: false
+  gem "puppet-lint-absolute_template_path", '>= 1.0.1',          require: false
+  gem "puppet-lint-empty_trailing_lines", '>= 0.0.1',            require: false
+  gem "puppet-lint-file_ensure-check", '>= 1.0.0',               require: false
+  gem "puppet-lint-strict_indent-check", '>= 2.0.8',             require: false
+  gem "puppet-lint-trailing_comma-check", '>= 0.4.3',            require: false
+  gem "puppet-lint-unquoted_string-check", '>= 2.1.0',           require: false
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
diff --git a/metadata.json b/metadata.json
index e4892cc3daa50f0df42320ecd17a47ffd34075ff..33c7aa13a9ca046a7cc32082de625955b080af1c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -61,7 +61,7 @@
       "version_requirement": ">= 6.21.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.3.0",
+  "pdk-version": "2.5.0",
   "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
-  "template-ref": "heads/liu-0-g76c91ed"
+  "template-ref": "heads/liu-0-g3298fb5"
 }