diff --git a/templates/essex/keystone.conf b/templates/essex/keystone.conf
index f514d9bb..310a46f3 100644
--- a/templates/essex/keystone.conf
+++ b/templates/essex/keystone.conf
@@ -31,7 +31,7 @@ driver = keystone.token.backends.sql.Token
 expiration = 86400
 
 [policy]
-driver = keystone.policy.backends.rules.Policy
+driver = keystone.policy.backends.sql.Policy
 
 [ec2]
 driver = keystone.contrib.ec2.backends.sql.Ec2
diff --git a/templates/folsom/keystone.conf b/templates/folsom/keystone.conf
index 5c09801f..0d9241fd 100644
--- a/templates/folsom/keystone.conf
+++ b/templates/folsom/keystone.conf
@@ -31,7 +31,7 @@ driver = keystone.token.backends.sql.Token
 expiration = 86400
 
 [policy]
-driver = keystone.policy.backends.rules.Policy
+driver = keystone.policy.backends.sql.Policy
 
 [ec2]
 driver = keystone.contrib.ec2.backends.sql.Ec2
diff --git a/templates/grizzly/keystone.conf b/templates/grizzly/keystone.conf
index 968c7d8a..3a31be58 100644
--- a/templates/grizzly/keystone.conf
+++ b/templates/grizzly/keystone.conf
@@ -31,18 +31,14 @@ driver = keystone.catalog.backends.sql.Catalog
 
 [token]
 driver = keystone.token.backends.sql.Token
-expiration = 86400
 
 [policy]
-driver = keystone.policy.backends.rules.Policy
+driver = keystone.policy.backends.sql.Policy
 
 [ec2]
 driver = keystone.contrib.ec2.backends.sql.Ec2
 
 [signing]
-token_format = UUID
-key_size = 2048
-valid_days = 3650
 
 [auth]
 methods = password,token
diff --git a/templates/havana/keystone.conf b/templates/havana/keystone.conf
index fade7ed0..a7661ade 100644
--- a/templates/havana/keystone.conf
+++ b/templates/havana/keystone.conf
@@ -43,19 +43,16 @@ expiration = 86400
 [cache]
 
 [policy]
-driver = keystone.policy.backends.rules.Policy
+driver = keystone.policy.backends.sql.Policy
 
 [ec2]
-driver = keystone.contrib.ec2.backends.kvs.Ec2
+driver = keystone.contrib.ec2.backends.sql.Ec2
 
 [assignment]
 
 [oauth1]
 
 [signing]
-token_format = UUID
-key_size = 2048
-valid_days = 3650
 
 [auth]
 methods = external,password,token,oauth1
diff --git a/templates/icehouse/keystone.conf b/templates/icehouse/keystone.conf
index 45eb5951..fc39d342 100644
--- a/templates/icehouse/keystone.conf
+++ b/templates/icehouse/keystone.conf
@@ -1,4 +1,4 @@
-# havana
+# icehouse
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
@@ -38,24 +38,20 @@ driver = keystone.catalog.backends.sql.Catalog
 
 [token]
 driver = keystone.token.backends.sql.Token
-expiration = 86400
 
 [cache]
 
 [policy]
-driver = keystone.policy.backends.rules.Policy
+driver = keystone.policy.backends.sql.Policy
 
 [ec2]
-driver = keystone.contrib.ec2.backends.kvs.Ec2
+driver = keystone.contrib.ec2.backends.sql.Ec2
 
 [assignment]
 
 [oauth1]
 
 [signing]
-token_format = UUID
-key_size = 2048
-valid_days = 3650
 
 [auth]
 methods = external,password,token,oauth1