diff --git a/Dockerfile b/Dockerfile.fedora-24
similarity index 100%
rename from Dockerfile
rename to Dockerfile.fedora-24
diff --git a/Dockerfile.ubuntu-16.04 b/Dockerfile.ubuntu-16.04
new file mode 100644
index 0000000..0d68590
--- /dev/null
+++ b/Dockerfile.ubuntu-16.04
@@ -0,0 +1,11 @@
+FROM ubuntu:16.04
+
+RUN apt-get update \
+    && apt-get install -y software-properties-common \
+    && apt-add-repository ppa:ansible/ansible \
+    && apt-get update \
+    && apt-get install -y \
+      ansible \
+    && apt-get autoclean
+
+
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..5b1fa04
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build -t registry.chmuul.net/ansible-controller:ubuntu-16.04 -f Dockerfile.ubuntu-16.04 ${@} .
+docker build -t registry.chmuul.net/ansible-controller:fedora-24 -f Dockerfile.fedora-24 ${@} .
+
+docker push registry.chmuul.net/ansible-controller:ubuntu-16.04
+docker push registry.chmuul.net/ansible-controller:fedora-24