diff --git a/contrail/environment/modules/contrail/manifests/database.pp b/contrail/environment/modules/contrail/manifests/database.pp
index d3318d68..0a9221b2 100644
--- a/contrail/environment/modules/contrail/manifests/database.pp
+++ b/contrail/environment/modules/contrail/manifests/database.pp
@@ -128,7 +128,9 @@
             ensure  => link,
             target  => "${analytics_data_dir}/ContrailAnalytics",
             require => File[$database_dir],
-            notify  => Service['supervisor-database']
+            notify  => Service['supervisor-database'],
+            owner   => cassandra,
+            group   => cassandra,
         }
     }
     contrail::lib::report_status { 'database_started':
@@ -165,7 +167,9 @@
     ->
     file { $database_dir :
         ensure  => directory,
-        require => Package['contrail-openstack-database']
+        require => Package['contrail-openstack-database'],
+        owner   => cassandra,
+        group   => cassandra,
     }
     ->
     file { "${contrail_cassandra_dir}/cassandra.yaml" :