diff --git a/contrail/environment/modules/contrail/manifests/database/config_cassandra.pp b/contrail/environment/modules/contrail/manifests/database/config_cassandra.pp
index 838c537a..3880cd67 100644
--- a/contrail/environment/modules/contrail/manifests/database/config_cassandra.pp
+++ b/contrail/environment/modules/contrail/manifests/database/config_cassandra.pp
@@ -19,6 +19,9 @@
       #        'commitlog_directory' => "${database_dir}/commitlog",
       #    },
       #}
+
+      $jvm_version_chk = 'sed -i -e \'s/if \[ \"\$JVM_VERSION\" \\< \"1.8\" \] && \[ \"\$JVM_PATCH_VERSION\" \\< \"25\" \] ; then/if \[ \"\$JVM_VERSION\" \\< \"1.8\" \] \&\& \[ \"\$JVM_PATCH_VERSION\" -lt \"25\" \] ; then/\' '
+
       file_line { 'Config Cassandra start_rpc':
           path => $cassandra_config_file,
           line => "start_rpc: true",
@@ -133,4 +136,9 @@
         command => "sed -i -e 's/lib\/jamm-0.2.5.jar/lib\/jamm-0.3.0.jar/' $cassandra_env_file",
         provider => shell,
       }
+      exec {
+        'cassandra-env-update':
+        command => "${jvm_version_chk}${cassandra_env_file}",
+        provider => shell,
+      }
 }