diff --git a/.drone.yml b/.drone.yml
index 28ada95..48804a3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,4 +1,15 @@
 pipeline:
+
+  build-ubuntu-18:
+    group: build
+    image: plugins/docker
+    repo: lerentis/ansible
+    tag: ubuntu-18.04
+    dockerfile: ubuntu-18.04/Dockerfile
+    dry_run: true
+    when:
+      event: [ push, pull_request ]
+
   build-ubuntu-16:
     group: build
     image: plugins/docker
@@ -79,6 +90,16 @@ pipeline:
     when:
       event: [ push, pull_request ]
 
+  build-ubuntu-18-publish:
+    group: build
+    image: plugins/docker
+    repo: lerentis/ansible
+    tag: ubuntu-18.04
+    dockerfile: ubuntu-18.04/Dockerfile
+    secrets: [ docker_username, docker_password ]
+    when:
+      event: [ tag ]
+
   build-ubuntu-16-publish:
     group: build
     image: plugins/docker
diff --git a/build-all.sh b/build-all.sh
index 2058b05..dfd069f 100644
--- a/build-all.sh
+++ b/build-all.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+cd ubuntu-18.04 && docker build -t lerentis/ansible:ubuntu-18.04 .
 cd ubuntu-16.04 && docker build -t lerentis/ansible:ubuntu-16.04 .
 cd ../alpine-3 && docker build -t lerentis/ansible:alpine-3 .
 cd ../ubuntu-14.04  && docker build -t lerentis/ansible:ubuntu-14.04 .
diff --git a/ubuntu-18.04/Dockerfile b/ubuntu-18.04/Dockerfile
new file mode 100644
index 0000000..0a24386
--- /dev/null
+++ b/ubuntu-18.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:18.04
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+      software-properties-common \
+      apt-utils \
+    && apt-add-repository ppa:ansible/ansible \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+      ansible \
+      python-apt \
+      git-core \
+      openssh-client \
+    && apt-get clean
+
+CMD ["ansible-playbook", "--help"]