diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2
index c5dfcb6785..565df5679d 100644
--- a/docker/panko/panko-api/Dockerfile.j2
+++ b/docker/panko/panko-api/Dockerfile.j2
@@ -13,9 +13,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
 
     {% elif base_distro in ['debian', 'ubuntu'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+        {% set panko_api_packages = [
+            'panko-api',
+            'python-pymongo'
+        ] %}
 
     {% endif %}
 {{ macros.install_packages(panko_api_packages | customizable("packages")) }}
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2
index d84c020316..1623bf6ffe 100644
--- a/docker/panko/panko-base/Dockerfile.j2
+++ b/docker/panko/panko-base/Dockerfile.j2
@@ -22,10 +22,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
     {% elif base_distro in ['debian', 'ubuntu'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
+        {% set panko_base_packages = [
+                'apache2',
+                'libapache2-mod-wsgi'
+        ] %}
+{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
diff --git a/tests/test_build.py b/tests/test_build.py
index 49e074da72..881052f32f 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -128,7 +128,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
         "monasca-base",
         "novajoin-base",
         "octavia-base",
-        "panko-base",
         "searchlight-base",
         "senlin-base",
         "solum-base",
@@ -173,7 +172,6 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase):
         "monasca-base",
         "novajoin-base",
         "octavia-base",
-        "panko-base",
         "searchlight-base",
         "senlin-base",
         "sensu-base",