diff --git a/Berksfile b/Berksfile
index 77d0da8..d2fdf04 100644
--- a/Berksfile
+++ b/Berksfile
@@ -5,6 +5,5 @@ metadata
 group :test do
   cookbook 'chef-services',
            '>= 4.0.0',
-           git: 'https://github.com/stephenlauck/chef-services.git',
-           branch: 'ad/simplify_pkgs'
+           git: 'https://github.com/stephenlauck/chef-services.git'
 end
diff --git a/metadata.rb b/metadata.rb
index 550b46a..3c9fb91 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,4 +1,3 @@
-# rubocop:disable LineLength
 name 'chef_stack'
 maintainer 'Chef Software Inc'
 maintainer_email 'success@chef.io'
diff --git a/resources/automate.rb b/resources/automate.rb
index cd9b191..ac9e8e4 100644
--- a/resources/automate.rb
+++ b/resources/automate.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_automate'
 default_action :create
@@ -72,7 +71,7 @@
     '/var/opt/delivery/license/delivery.license' => new_resource.license,
     "/etc/delivery/#{new_resource.chef_user}.pem" => new_resource.chef_user_pem,
     '/etc/chef/validation.pem' => new_resource.validation_pem,
-    '/etc/delivery/builder_key' => new_resource.builder_pem
+    '/etc/delivery/builder_key' => new_resource.builder_pem,
   }.each do |file, src|
     chef_file file do
       source src
diff --git a/resources/backend.rb b/resources/backend.rb
index bef0a00..6893b05 100644
--- a/resources/backend.rb
+++ b/resources/backend.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_backend'
 default_action :create
diff --git a/resources/chef_org.rb b/resources/chef_org.rb
index 32f5605..2d7e101 100644
--- a/resources/chef_org.rb
+++ b/resources/chef_org.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_org'
 default_action :create
diff --git a/resources/chef_user.rb b/resources/chef_user.rb
index 8ea3dec..382372f 100644
--- a/resources/chef_user.rb
+++ b/resources/chef_user.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_user'
 default_action :create
diff --git a/resources/client.rb b/resources/client.rb
index e3c02ab..09b9963 100644
--- a/resources/client.rb
+++ b/resources/client.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 # rubocop:disable ParenthesesAsGroupedExpression
 
 resource_name 'chef_client'
diff --git a/resources/server.rb b/resources/server.rb
index c7e53ca..cc260c2 100644
--- a/resources/server.rb
+++ b/resources/server.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_server'
 default_action :create
diff --git a/resources/supermarket.rb b/resources/supermarket.rb
index 9a4fed1..8bbfad3 100644
--- a/resources/supermarket.rb
+++ b/resources/supermarket.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_supermarket'
 default_action :create
diff --git a/resources/wf_builder.rb b/resources/wf_builder.rb
index 246885f..113dd84 100644
--- a/resources/wf_builder.rb
+++ b/resources/wf_builder.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'workflow_builder'
 default_action :create
@@ -62,7 +61,7 @@
   [
     new_resource.chef_fqdn,
     new_resource.automate_fqdn,
-    new_resource.supermarket_fqdn
+    new_resource.supermarket_fqdn,
   ].each do |server|
     execute "fetch ssl cert for #{server}" do
       command "knife ssl fetch -s https://#{server} -c #{Chef::Config['config_file']}"
@@ -243,7 +242,7 @@
           os: node['os'],
           platform_family: node['platform_family'],
           platform: node['platform'],
-          platform_version: node['platform_version']
+          platform_version: node['platform_version'],
         }
 
         runner = Mixlib::ShellOut.new("delivery api post runners \