diff --git a/manifests/params.pp b/manifests/params.pp
index 39cd005..fb461de 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,51 +1,58 @@
 # This class is meant to be called from the locp-cassandra module.
 # It sets variables according to platform.
 class cassandra::params {
   case $::osfamily {
     'Debian': {
       case $::operatingsystemmajrelease {
-        12.04: {
+        '12.04': {
           $net_ipv4_tcp_rmem = '4096 87380 16777216'
           $net_ipv4_tcp_wmem = '4096 65536 16777216'
+          $java_package = 'openjdk-7-jre-headless'
         }
+        '18.04': {
+          $net_ipv4_tcp_rmem = '4096 87380 16777216'
+          $net_ipv4_tcp_wmem = '4096 65536 16777216'
+          $java_package = 'openjdk-8-jre-headless'
+        }
+        # non-Ubuntu Debian is just... Debian
         default: {
           $net_ipv4_tcp_rmem = '4096, 87380, 16777216'
           $net_ipv4_tcp_wmem = '4096, 65536, 16777216'
+          $java_package = 'openjdk-7-jre-headless'
         }
       }
 
       $cassandra_pkg = 'cassandra'
       $config_path = '/etc/cassandra'
-      $java_package = 'openjdk-7-jre-headless'
       $jna_package_name = 'libjna-java'
       $optutils_package_name = 'cassandra-tools'
       $sysctl_file = '/etc/sysctl.d/10-cassandra.conf'
       $systemctl = '/bin/systemctl'
     }
     'RedHat': {
       case $::operatingsystemmajrelease {
         6: {
           $net_ipv4_tcp_rmem = '4096 87380 16777216'
           $net_ipv4_tcp_wmem = '4096 65536 16777216'
           $sysctl_file = '/etc/sysctl.conf'
         }
         7: {
           $net_ipv4_tcp_rmem = '4096, 87380, 16777216'
           $net_ipv4_tcp_wmem = '4096, 65536, 16777216'
           $sysctl_file = '/etc/sysctl.d/10-cassandra.conf'
         }
         default: {}
       }
 
       $cassandra_pkg = 'cassandra22'
       $config_path = '/etc/cassandra/default.conf'
       $java_package = 'java-1.8.0-openjdk-headless'
       $jna_package_name = 'jna'
       $optutils_package_name = 'cassandra22-tools'
       $systemctl = '/usr/bin/systemctl'
     }
     default: {
       $config_path_parents = []
     }
   }
 }
diff --git a/metadata.json b/metadata.json
index 8ac2be8..eae9f85 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,86 +1,87 @@
 {
   "name": "puppet-cassandra",
   "version": "2.7.4-rc0",
   "author": "Vox Pupuli",
   "summary": "Installs Cassandra & DataStax Agent on RHEL/Ubuntu/Debian.",
   "license": "Apache-2.0",
   "source": "https://github.com/voxpupuli/puppet-cassandra",
   "project_page": "https://github.com/voxpupuli/puppet-cassandra",
   "issues_url": "https://github.com/voxpupuli/puppet-cassandra/issues",
   "tags": [
     "Apache",
     "cassandra",
     "cluster",
     "database",
     "datastax",
     "datastax-agent",
     "nosql"
   ],
   "dependencies": [
     {
       "name": "puppetlabs-apt",
       "version_requirement": ">= 2.0.0 < 7.0.0"
     },
     {
       "name": "puppetlabs-firewall",
       "version_requirement": ">= 1.0.0 < 2.0.0"
     },
     {
       "name": "puppetlabs-inifile",
       "version_requirement": ">= 1.5.0 < 3.0.0"
     },
     {
       "name": "puppetlabs-stdlib",
       "version_requirement": ">= 3.0.0 < 6.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "8"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 4.10.0 < 7.0.0"
     }
   ]
 }