diff --git a/.rubocop.yml b/.rubocop.yml
index 5cdaff6..de151c8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -22,7 +22,9 @@ MethodLength:
   Enabled: false
 SignalException:
   Enabled: false
-TrailingComma:
+TrailingCommaInLiteral:
+  Enabled: false
+TrailingCommaInArguments:
   Enabled: false
 WordArray:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index ef70148..f9b9f71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,15 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'berkshelf', '~> 3.3.0'
+gem 'berkshelf', '~> 4.3.0'
 gem 'stove'
 
 group :test do
-  gem 'foodcritic', '~> 4.0.0'
-  gem 'rubocop', '~> 0.33.0'
+  gem 'foodcritic', '~> 6.0.1'
+  gem 'rubocop', '~> 0.38.0'
 end
 
 group :integration do
-  gem 'test-kitchen', '~> 1.4.2'
-  gem 'kitchen-vagrant', '~> 0.18.0'
+  gem 'test-kitchen', '~> 1.7.2'
+  gem 'kitchen-vagrant', '~> 0.20.0'
 end
diff --git a/files/default/hipchat_handler.rb b/files/default/hipchat_handler.rb
index d6922fb..fcc0d53 100644
--- a/files/default/hipchat_handler.rb
+++ b/files/default/hipchat_handler.rb
@@ -68,7 +68,7 @@ def hipchat_emoji
         if @emoji_url.nil?
           ''
         else
-          %(#{'<img src=' + @emoji_url + '> '})
+          "<img src=#{emoji_url}> "
         end
       end
 
diff --git a/recipes/default.rb b/recipes/default.rb
index 41929df..7a86d40 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -19,7 +19,9 @@
 
 include_recipe 'chef_handler'
 
-chef_gem 'hipchat'
+chef_gem 'hipchat' do
+  compile_time false if respond_to?(:compile_time)
+end
 
 handler_file = File.join(node['chef_handler']['handler_path'], 'hipchat_handler.rb')