diff --git a/deployment_scripts/puppet/manifests/Gemfile b/deployment_scripts/puppet/manifests/Gemfile
index 0562406..14e89c7 100644
--- a/deployment_scripts/puppet/manifests/Gemfile
+++ b/deployment_scripts/puppet/manifests/Gemfile
@@ -17,7 +17,4 @@ group :development, :test do
   gem 'rake'
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
   gem 'puppetlabs_spec_helper'
-  # Need to use master branch of puppet-lint because of
-  # https://github.com/rodjek/puppet-lint/issues/355
-  gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
 end
diff --git a/deployment_scripts/puppet/modules/lma_logging_analytics/Rakefile b/deployment_scripts/puppet/modules/lma_logging_analytics/Rakefile
index b5e3f5b..eff75b7 100644
--- a/deployment_scripts/puppet/modules/lma_logging_analytics/Rakefile
+++ b/deployment_scripts/puppet/modules/lma_logging_analytics/Rakefile
@@ -13,7 +13,11 @@ exclude_paths = [
     "vendor/**/*",
     "spec/**/*",
 ]
-PuppetLint.configuration.ignore_paths = exclude_paths
+Rake::Task[:lint].clear
+PuppetLint::RakeTask.new :lint do |config|
+    config.ignore_paths = exclude_paths
+end
+
 PuppetSyntax.exclude_paths = exclude_paths
 
 desc "Run metadata_lint, lint, syntax, and spec tests."