diff --git a/files/default/hpmiddleware-keystore-development.jks b/files/default/hpmiddleware-keystore-development.jks
deleted file mode 100644
index 340d991..0000000
Binary files a/files/default/hpmiddleware-keystore-development.jks and /dev/null differ
diff --git a/files/default/hpmiddleware-keystore-production.jks b/files/default/hpmiddleware-keystore-production.jks
deleted file mode 100644
index 2bf256e..0000000
Binary files a/files/default/hpmiddleware-keystore-production.jks and /dev/null differ
diff --git a/files/default/hpmiddleware-truststore.jks b/files/default/hpmiddleware-truststore.jks
deleted file mode 100644
index e255ac0..0000000
Binary files a/files/default/hpmiddleware-truststore.jks and /dev/null differ
diff --git a/metadata.rb b/metadata.rb
index 961dd32..e2b846d 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,4 +6,4 @@ maintainer_email 'hpcs-mon-som@hp.com'
 license          'All rights reserved'
 description      'Installs/Configures mon_api'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.0.10'
+version          '0.0.11'
diff --git a/templates/default/mon-service-config.yml.erb b/templates/default/mon-service-config.yml.erb
index d70009f..d7b4636 100644
--- a/templates/default/mon-service-config.yml.erb
+++ b/templates/default/mon-service-config.yml.erb
@@ -91,17 +91,14 @@ middleware:
   serverPort: 5000
   connTimeout: 500
   connSSLClientAuth: true
-  keystore: /etc/ssl/hpmiddleware-keystore.jks
-  keystorePass: changeit
-  truststore: /etc/ssl/hpmiddleware-truststore.jks
-  truststorePass: <%= @creds['middleware']['truststore_password'] %>
   connPoolMaxActive: 3
   connPoolMaxIdle: 3
   connPoolEvictPeriod: 600000
   connPoolMinIdleTime: 600000
   connRetryTimes: 2
   connRetryInterval: 50
-  rolesToMatch: [user, domainuser, domainadmin,_member_]
+  defaultAuthorizedRoles: [user, domainuser, domainadmin,_member_]
+  agentAuthorizedRoles: [monasca-agent]
   adminAuthMethod: <%= @creds['middleware']['adminAuthMethod'] %>
   adminUser: <%= @creds['middleware']['adminUser'] %>
   adminPassword: <%= @creds['middleware']['adminPassword'] %>