diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index a10e55f466..8e93160512 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -21,3 +21,7 @@ cron_image_full: "{{ cron_image }}:{{ cron_tag }}"
 fluentd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-fluentd"
 fluentd_tag: "{{ openstack_release }}"
 fluentd_image_full: "{{ fluentd_image }}:{{ fluentd_tag }}"
+
+kubetoolbox_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kubetoolbox"
+kubetoolbox_tag: "{{ openstack_release }}"
+kubetoolbox_image_full: "{{ kubetoolbox_image }}:{{ kubetoolbox_tag }}"
diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2
new file mode 100644
index 0000000000..59db2d8f31
--- /dev/null
+++ b/docker/kubetoolbox/Dockerfile.j2
@@ -0,0 +1,32 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block kubetoolbox_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+    {% set kubetoolbox_packages = [
+     'jq',
+     'ceph-common',
+     'ipmitool'
+    ] %}
+
+{% elif base_distro in ['ubuntu', 'debian'] %}
+
+    {% set kubetoolbox_packages = [
+     'jq',
+     'ceph-common',
+     'ipmitool'
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }}
+
+RUN curl -o /usr/bin/kubectl http://storage.googleapis.com/kubernetes-release/release/v1.4.0/bin/linux/amd64/kubectl \
+    && chmod 755 /usr/bin/kubectl
+
+{% block kubetoolbox_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+{{ include_footer }}