diff --git a/data/osfamily/Debian/12.04/default.yaml b/data/osfamily/Debian/12.04/default.yaml
deleted file mode 100644
index ead147c..0000000
--- a/data/osfamily/Debian/12.04/default.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-conserver::server_init_config_file: /etc/conserver/server.local
-conserver::server_init_config_tpl: conserver/server/init_config_file.erb
-conserver::server_init_config_hash: {}
-conserver::server_user: conservr
-conserver::status_cmd: true
diff --git a/data/osfamily/Debian/14.04/default.yaml b/data/osfamily/Debian/14.04/default.yaml
deleted file mode 100644
index ead147c..0000000
--- a/data/osfamily/Debian/14.04/default.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-conserver::server_init_config_file: /etc/conserver/server.local
-conserver::server_init_config_tpl: conserver/server/init_config_file.erb
-conserver::server_init_config_hash: {}
-conserver::server_user: conservr
-conserver::status_cmd: true
diff --git a/data/osfamily/Debian/16.04/default.yaml b/data/osfamily/Debian/16.04/default.yaml
deleted file mode 100644
index 8302c60..0000000
--- a/data/osfamily/Debian/16.04/default.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-conserver::server_init_config_file: /usr/lib/systemd/system/conserver.service
-conserver::server_init_config_tpl: conserver/server/init_config_file_systemd.erb
-conserver::server_init_config_hash:
-  Unit:
-    Description: Conserver Serial-Port Console Daemon
-    After: network.target
-  Service:
-    Type: forking
-    ExecStart: /usr/sbin/conserver -d
-    User: root
-  Install:
-    WantedBy: multi-user.target
-conserver::server_user: root
-conserver::status_cmd: true
-conserver::has_systemd: true
diff --git a/data/osfamily/Debian/7/default.yaml b/data/osfamily/Debian/7/default.yaml
deleted file mode 100644
index ead147c..0000000
--- a/data/osfamily/Debian/7/default.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-conserver::server_init_config_file: /etc/conserver/server.local
-conserver::server_init_config_tpl: conserver/server/init_config_file.erb
-conserver::server_init_config_hash: {}
-conserver::server_user: conservr
-conserver::status_cmd: true
diff --git a/data/osfamily/Debian/8/default.yaml b/data/osfamily/Debian/8/default.yaml
deleted file mode 100644
index 8302c60..0000000
--- a/data/osfamily/Debian/8/default.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-conserver::server_init_config_file: /usr/lib/systemd/system/conserver.service
-conserver::server_init_config_tpl: conserver/server/init_config_file_systemd.erb
-conserver::server_init_config_hash:
-  Unit:
-    Description: Conserver Serial-Port Console Daemon
-    After: network.target
-  Service:
-    Type: forking
-    ExecStart: /usr/sbin/conserver -d
-    User: root
-  Install:
-    WantedBy: multi-user.target
-conserver::server_user: root
-conserver::status_cmd: true
-conserver::has_systemd: true
diff --git a/data/osfamily/Debian/9/default.yaml b/data/osfamily/Debian/9/default.yaml
deleted file mode 100644
index 8302c60..0000000
--- a/data/osfamily/Debian/9/default.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-conserver::server_init_config_file: /usr/lib/systemd/system/conserver.service
-conserver::server_init_config_tpl: conserver/server/init_config_file_systemd.erb
-conserver::server_init_config_hash:
-  Unit:
-    Description: Conserver Serial-Port Console Daemon
-    After: network.target
-  Service:
-    Type: forking
-    ExecStart: /usr/sbin/conserver -d
-    User: root
-  Install:
-    WantedBy: multi-user.target
-conserver::server_user: root
-conserver::status_cmd: true
-conserver::has_systemd: true
diff --git a/data/osfamily/Debian/default.yaml b/data/osfamily/Debian/default.yaml
index 6a0bc14..ad5659f 100644
--- a/data/osfamily/Debian/default.yaml
+++ b/data/osfamily/Debian/default.yaml
@@ -2,6 +2,11 @@
 conserver::server_package_name: conserver-server
 conserver::client_package_name: conserver-client
 conserver::service_name: conserver-server
-conserver::confdir: /etc/conserver'
+conserver::confdir: /etc/conserver
 conserver::restart_cmd: /usr/sbin/service conserver-server restart
 conserver::reload_cmd: service conserver-server reload
+conserver::status_cmd: true
+conserver::server_init_config_file: /etc/conserver/server.local
+conserver::server_init_config_tpl: conserver/server/init_config_file.erb
+conserver::server_init_config_hash: {}
+conserver::server_user: conservr
diff --git a/metadata.json b/metadata.json
index 9a46a21..ed48e35 100644
--- a/metadata.json
+++ b/metadata.json
@@ -29,6 +29,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
+        "18.04",
         "16.04",
         "14.04",
         "12.04"
diff --git a/spec/classes/systemd_spec.rb b/spec/classes/systemd_spec.rb
index 1890362..5bf8d1b 100644
--- a/spec/classes/systemd_spec.rb
+++ b/spec/classes/systemd_spec.rb
@@ -3,7 +3,7 @@
 os_fixtures = @os_fixtures
 
 describe 'conserver', type: 'class' do
-  %w[RedHat7 Debian8 Debian9 Ubuntu16.04].each do |osname|
+  %w[RedHat7].each do |osname|
     osfixtures = os_fixtures[osname]
 
     context "On os `#{osname}`" do
@@ -14,7 +14,7 @@
       it { should contain_systemd__unit_file("#{osfixtures[:params][:server_service_name]}.service") }
     end
   end
-  ['RedHat6', 'Debian7', 'Ubuntu12.04'].each do |osname|
+  %w[RedHat6 Debian7 Debian8 Debian9 Ubuntu12.04 Ubuntu16.04].each do |osname|
     osfixtures = os_fixtures[osname]
 
     context "On os `#{osname}`" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 734c55c..b22cac3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -143,5 +143,18 @@
       server_package_name: 'conserver-server',
       client_package_name: 'conserver-client'
     }
+  ),
+  'Ubuntu18.04' => @common_fixtures.merge(
+    facts: {
+      os: {
+        family: 'Debian',
+        release: { major: '18.04' }
+      }
+    },
+    params: {
+      server_service_name: 'conserver-server',
+      server_package_name: 'conserver-server',
+      client_package_name: 'conserver-client'
+    }
   )
 }