diff --git a/.travis.yml b/.travis.yml
index 79bc368..46796cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,7 @@ services: docker
 
 matrix:
   include:
-    # https://hub.docker.com/_/fedora/
-    # will use centos:8 after it released
-    - env: CONTAINER_IMAGE=fedora:28 TOXENV=py36
+    - env: CONTAINER_IMAGE=py36 TOXENV=py36
 
 install:
   - pip install coveralls
diff --git a/.travis/Dockerfile.fedora:28 b/.travis/Dockerfile.fedora:28
deleted file mode 100644
index 39edabf..0000000
--- a/.travis/Dockerfile.fedora:28
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM fedora:28
-
-WORKDIR /build
-
-# Hack for DNF bug
-# ValueError("The supplied metadata version isn't supported")
-# https://bugzilla.redhat.com/1566593 has not yet made its way to the container
-# images yet.
-RUN sed -i s/enabled=1/enabled=0/ /etc/yum.repos.d/*-modular.repo || :
-
-# pygresql requires postgresql-devel
-# koji requires krb5-devel
-# rpm-py-installer (for koji) requires rpm-devel gcc python-devel
-RUN yum -y --setopt skip_missing_names_on_install=False install \
-  tox \
-  postgresql-devel \
-  krb5-devel \
-  rpm-devel gcc python-devel
-
-COPY . .
-
-CMD ["tox"]
diff --git a/.travis/Dockerfile.py36 b/.travis/Dockerfile.py36
new file mode 100644
index 0000000..df53dde
--- /dev/null
+++ b/.travis/Dockerfile.py36
@@ -0,0 +1,21 @@
+FROM centos:8
+
+WORKDIR /build
+
+# pyscopg2 requires postgresql-devel
+# koji requires krb5-devel
+# rpm-py-installer (for koji) requires rpm-devel gcc python3-devel
+RUN dnf -y install \
+  gcc \
+  krb5-devel \
+  postgresql-devel \
+  python36 \
+  python36-devel \
+  redhat-rpm-config \
+  rpm-devel
+
+RUN pip3 install --no-cache-dir tox
+
+COPY . .
+
+CMD ["tox"]
diff --git a/Dockerfile b/Dockerfile
index a62a3a4..8b5887c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,23 @@
-FROM centos:7
+FROM centos:8
 LABEL \
     name="product-listings-manager" \
     vendor="product-listings-manager developers" \
     license="MIT" \
     build-date=""
 
-RUN yum install -y epel-release \
-    && yum -y update \
+RUN yum -y update \
     && yum -y install \
+        gcc \
         git \
-        python-pip \
-        python-flask \
-        python-psycopg2 \
-        python-sqlalchemy \
-        python2-flask-restful \
-        python2-flask-sqlalchemy \
-        python2-koji \
-    && pip install \
-        gunicorn \
-        futures
+        krb5-devel \
+        postgresql-devel \
+        python36 \
+        python36-devel \
+        redhat-rpm-config \
+        rpm-devel \
+    && yum -y clean all \
+    && rm -rf /var/cache/dnf \
+    && rm -rf /tmp/*
 
 WORKDIR /var/www/product-listings-manager
 
@@ -27,11 +26,10 @@ COPY .git .git
 RUN git reset --hard HEAD \
     && git checkout HEAD
 
-# Clean up.
-RUN yum -y remove git \
-    && yum -y clean all \
-    && rm -rf /var/cache/yum \
-    && rm -rf /tmp/*
+RUN pip3 install --no-cache-dir \
+        -r requirements.txt \
+        gunicorn \
+        futures
 
 ARG cacert_url
 RUN if [ -n "$cacert_url" ]; then \