diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0941ce7..fc2d7ed 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,19 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-05-29 12:11:07 -0500 using RuboCop version 0.29.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-08-03 05:25:56 -0700 using RuboCop version 0.55.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
-  Enabled: false
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'recipes/common.rb'
+
+# Offense count: 24
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 133
diff --git a/Berksfile b/Berksfile
index 9aaac51..b5ed172 100644
--- a/Berksfile
+++ b/Berksfile
@@ -7,4 +7,4 @@ cookbook 'openstack-identity',
 cookbook 'openstack-common',
   github: 'openstack/cookbook-openstack-common'
 cookbook 'openstackclient',
-  github: 'cloudbau/cookbook-openstackclient'
+  git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
diff --git a/metadata.rb b/metadata.rb
index 240bed8..a46d068 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -8,7 +8,7 @@ license 'Apache-2.0'
 description 'Installs and configures the Designate Service'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 chef_version '>= 12.5' if respond_to?(:chef_version)
-version '17.0.0'
+version '18.0.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os