diff --git a/.kitchen.yml b/.kitchen.yml
index 7a16e14..8d6ff9c 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -15,13 +15,24 @@ provisioner:
   ansible_inventory: ./test/integration/inventory
 
 platforms:
-  - name: debian-9
+  - name: debian9
     driver_config:
       image: "nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.7' %>"
       command: /bin/systemd
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
       security_opt: seccomp=unconfined
+    provisioner:
+      extra_vars:
+        sensu_repository_system: ubuntu
+        sensu_repository_release: xenial
+  - name: ubuntu18.04
+    driver_config:
+      image: "nishiki/ubuntu18.04:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.7' %>"
+      command: /bin/systemd
+      volume:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      security_opt: seccomp=unconfined
 
 suites:
   - name: default
diff --git a/.travis.yml b/.travis.yml
index 1cf431c..830b000 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,9 @@ before_install:
   - git clone https://github.com/ansible/galaxy-lint-rules.git
 
 script:
-  - kitchen conv default-debian-9
-  - kitchen conv default-debian-9 | grep changed=0
-  - kitchen verify default-debian-9
+  - kitchen conv
+  - kitchen conv default-debian9 | grep changed=0
+  - kitchen verify
   - ansible-lint -r galaxy-lint-rules/rules .
   - yamllint .
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d44250d..0a0d780 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+- feat: add support of ubuntu 18.04
 - feat: add multiple namespaces for the checks, filters, handlers or assets
 - fix: install python-requests for backend
 - fix: install build-essential for agent
diff --git a/README.md b/README.md
index e58948a..9218bd2 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,9 @@ Install and configure sensu-go backend and agent
 ## Requirements
 
 * Ansible >= 2.5
-* Debian Stretch
+* OS
+  * Debian Stretch
+  * Ubuntu 18.04
 
 ## Role variables
 ### General
diff --git a/meta/main.yml b/meta/main.yml
index b9004c2..8f9db8f 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,6 +11,9 @@ galaxy_info:
     - name: Debian
       versions:
         - stretch
+    - name: Ubuntu
+      versions:
+        - 18.04
 
   galaxy_tags:
     - sensu
diff --git a/test/integration/default/default.yml b/test/integration/default/default.yml
index 1601dad..d296d01 100644
--- a/test/integration/default/default.yml
+++ b/test/integration/default/default.yml
@@ -3,8 +3,6 @@
   connection: local
   vars:
     sensu_backend: yes
-    sensu_repository_system: ubuntu
-    sensu_repository_release: xenial
     sensu_agent_plugins:
       - name: sensu-plugins-disk-checks
         version: 3.1.1