diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..ca56abb
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=stackforge/cookbook-monasca-persister
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..5500e6d
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,24 @@
+AllCops:
+  Includes:
+    - metadata.rb
+    - Gemfile
+    - attributes/**
+    - libraries/**
+    - providers/**
+    - recipes/**
+    - resources/**
+    - spec/**
+
+Encoding:
+  Exclude:
+    - metadata.rb
+    - Gemfile
+
+NumericLiterals:
+  Enabled: false
+
+LineLength:
+  Enabled: false
+
+WordArray:
+  MinSize: 3
diff --git a/Berksfile b/Berksfile
new file mode 100644
index 0000000..850a120
--- /dev/null
+++ b/Berksfile
@@ -0,0 +1 @@
+metadata
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..eeb359d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'chef', '~> 11.8'
+gem 'json', '<= 1.7.7' # chef 11 dependency
+gem 'berkshelf', '~> 2.0.18'
+gem 'hashie', '~> 2.0'
+gem 'chefspec', '~> 3.4.0'
+gem 'rspec', '~> 2.14.1'
+gem 'foodcritic', '~> 3.0.3'
+gem 'strainer'
+gem 'rubocop', '~> 0.18.1'
diff --git a/Strainerfile b/Strainerfile
new file mode 100644
index 0000000..cf2ff52
--- /dev/null
+++ b/Strainerfile
@@ -0,0 +1,5 @@
+# Strainerfile
+rubocop: rubocop $SANDBOX/$COOKBOOK
+knife test: knife cookbook test $COOKBOOK
+foodcritic: foodcritic -f any -t ~FC003 -t ~FC023 $SANDBOX/$COOKBOOK
+chefspec: rspec $SANDBOX/$COOKBOOK/spec
diff --git a/attributes/default.rb b/attributes/default.rb
index a613b9e..1015fda 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,8 +1,10 @@
+# encoding: UTF-8#
+#
 node.default[:mon_persister][:group] = 'persister'
 node.default[:mon_persister][:data_bag] = 'mon_persister'
 
-#Sysctl settings
-#This style is picked up by the sysctl cookbook in HP Cloud basenode
+# Sysctl settings
+# This style is picked up by the sysctl cookbook in HP Cloud basenode
 node.default[:sysctl]['net.core.rmem_max'] = '16777216'
-#This style is used by the sysctl community cookbook
+# This style is used by the sysctl community cookbook
 node.default[:sysctl][:params][:net][:core][:rmem_max] = '16777216'
diff --git a/metadata.rb b/metadata.rb
index 4fa2826..e4b6b51 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,7 +1,9 @@
+# encoding: UTF-8#
+#
 name             'mon_persister'
-maintainer       "Monitoring Team"
-maintainer_email "hpcs-mon@hp.com"
-license          "All rights reserved"
-description      "Installs/Configures som_persister"
+maintainer       'Monitoring Team'
+maintainer_email 'hpcs-mon@hp.com'
+license          'All rights reserved'
+description      'Installs/Configures som_persister'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.1.17"
+version          '0.1.17'
diff --git a/recipes/default.rb b/recipes/default.rb
index 8f63b4e..82782e6 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -1,4 +1,6 @@
-package 'mon-persister' do #The package depends on openjdk-7-jre
+# encoding: UTF-8#
+#
+package 'mon-persister' do # The package depends on openjdk-7-jre
   action :upgrade
 end
 
@@ -8,15 +10,15 @@ service 'mon-persister' do
 end
 
 # Create the log file directory
-directory "/var/log/mon" do
-    recursive true
-    owner "persister"
-    group node[:mon_persister][:group]
-    mode 0755
-    action :create
+directory '/var/log/mon' do
+  recursive true
+  owner 'persister'
+  group node[:mon_persister][:group]
+  mode 0755
+  action :create
 end
 
-# Todo encrypt the credentials data bag item
+# TODO: encrypt the credentials data bag item
 credentials = data_bag_item(node[:mon_persister][:data_bag], 'mon_credentials')
 settings = data_bag_item(node[:mon_persister][:data_bag], 'mon_persister')
 
@@ -24,11 +26,11 @@ template '/etc/mon/persister-config.yml' do
   action :create
   owner 'root'
   group node[:mon_persister][:group]
-  mode "640"
-  source "persister-config.yml.erb"
+  mode '640'
+  source 'persister-config.yml.erb'
   variables(
-    :credentials => credentials,
-    :settings => settings
+    credentials: credentials,
+    settings: settings
   )
-  notifies :restart, "service[mon-persister]"
+  notifies :restart, 'service[mon-persister]'
 end
diff --git a/spec/empty.rb b/spec/empty.rb
new file mode 100644
index 0000000..fc2f6d6
--- /dev/null
+++ b/spec/empty.rb
@@ -0,0 +1,2 @@
+# encoding: UTF-8
+# No unit tests at this time.