diff --git a/Dockerfile.rhel-8.0.0 b/Dockerfile.rhel-8.0.0
new file mode 100644
index 0000000..6efb1c6
--- /dev/null
+++ b/Dockerfile.rhel-8.0.0
@@ -0,0 +1,251 @@
+FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/rhel:8.0.0 AS agama-user
+
+# Configure DNF and YUM proxies
+RUN echo "proxy=http://proxy-chain.intel.com:911" >> /etc/dnf/dnf.conf \
+  && echo -e 'proxy=http://proxy-chain.intel.com:911\nno_proxy=.intel.com' >> /etc/yum.conf
+
+# Remove any pre-configured repositories
+RUN rm -rf /etc/yum.repos.d/*
+
+# Install the Red Hat partner repositories
+RUN { \
+  echo "[RHEL-8-appstream-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (AppStream) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/AppStream/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-appstream-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (AppStream) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/AppStream/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-appstream-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (AppStream) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/AppStream/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-appstream-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-baseos-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (BaseOS) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/BaseOS/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-baseos-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (BaseOS) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/BaseOS/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-baseos-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (BaseOS) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/BaseOS/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-baseos-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-crb-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (CRB) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/CRB/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-crb-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (CRB) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/CRB/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-crb-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (CRB) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/CRB/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-crb-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-highavailability-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (HighAvailability) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/HighAvailability/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-highavailability-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (HighAvailability) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/HighAvailability/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-highavailability-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (HighAvailability) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/HighAvailability/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-highavailability-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-resilientstorage-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (ResilientStorage) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/ResilientStorage/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-resilientstorage-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (ResilientStorage) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/ResilientStorage/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-resilientstorage-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (ResilientStorage) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/ResilientStorage/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-resilientstorage-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-rt-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (RT) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/RT/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-rt-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (RT) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/RT/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-rt-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (RT) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/RT/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-rt-intel-partner.repo
+
+# Update package lists, and upgrade to the latest Red Hat packages
+RUN dnf clean all \
+  && dnf -y upgrade \
+  && dnf clean all
+
+# Agama specific content begins here
+#
+# Add Intel Graphics repository
+RUN { \
+  echo "[intel-graphics]" ; \
+  echo "name=Intel Graphics Drivers Repository" ; \
+  echo "baseurl=https://osgc.jf.intel.com/graphics/rhel/8.0-devel/" ; \
+  echo "sslverify=0" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=0" ; \
+} > /etc/yum.repos.d/intel-graphics.repo
+
+# Docker.solution based on the Intel-Media-SDK instructions available here:
+#
+# https://github.com/Intel-Media-SDK/MediaSDK/wiki/Build-and-use-ffmpeg-with-MediaSDK
+#
+# This should really be part of a multi-stage build so the final 
+# image isn't polluted with build artifacts
+#
+# NOTE: This image will only work with Ubuntu 19.04 (disco) and newer
+FROM agama-user AS solution-build
+
+# Install git and build tools, clone ffmpeg, and get ready to build it
+RUN dnf groupinstall -y 'Development Tools'
+
+# Clone ffmpeg
+# NOTE: This explicitly clones the FFMPEG_TAG_VERSION (see SOLUTIONS)
+RUN git clone --depth 1 --branch n4.2.1 https://github.com/ffmpeg/ffmpeg /ffmpeg
+
+# Install all required common packages:
+# Adapted from 
+RUN dnf install -y \
+    libva-devel \
+    intel-mediasdk-devel \
+    libva-utils \
+  && dnf clean
+
+ENV LIBVA_DRIVER_NAME=iHD
+
+# Build FFmpeg
+WORKDIR /ffmpeg
+
+RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \
+  && make -j $(nproc --all) \
+  && make install
+
+FROM agama-user
+
+ENV LIBVA_DRIVER_NAME=iHD
+
+# Update and install the Mesa, OpenCL, and Media from Agama
+#
+# NOTE: libva requires libpciaccess0, however it doesn't depend on it
+# so explicitly install it.
+#    intel-media-va-driver-non-free \
+RUN dnf install -y \
+    intel-media \
+    libva \
+    intel-mediasdk \
+    libva-utils \
+    libpciaccess \
+    pciutils \
+  && dnf clean
+
+# Copy ffmpeg and ffprobe from build container
+COPY --from=solution-build /usr/local/bin/ /usr/local/bin/
+
+WORKDIR /home/agama
+
+# Copy boiler plate entry point
+COPY assets/ /assets/
+ENTRYPOINT [ "/assets/entry" ]
+
+# Ensure that each Docker container self-documents the 
+# versions included in it
+
+ENV AGAMA_VERSION=
+
+COPY MANIFEST SOLUTION Dockerfile /assets/
diff --git a/Dockerfile.solution.rhel-8.0.0 b/Dockerfile.solution.rhel-8.0.0
new file mode 100644
index 0000000..198715d
--- /dev/null
+++ b/Dockerfile.solution.rhel-8.0.0
@@ -0,0 +1,251 @@
+FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/rhel:8.0.0 AS agama-user
+
+# Configure DNF and YUM proxies
+RUN echo "proxy=http://proxy-chain.intel.com:911" >> /etc/dnf/dnf.conf \
+  && echo -e 'proxy=http://proxy-chain.intel.com:911\nno_proxy=.intel.com' >> /etc/yum.conf
+
+# Remove any pre-configured repositories
+RUN rm -rf /etc/yum.repos.d/*
+
+# Install the Red Hat partner repositories
+RUN { \
+  echo "[RHEL-8-appstream-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (AppStream) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/AppStream/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-appstream-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (AppStream) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/AppStream/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-appstream-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (AppStream) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/AppStream/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-appstream-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-baseos-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (BaseOS) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/BaseOS/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-baseos-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (BaseOS) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/BaseOS/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-baseos-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (BaseOS) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/BaseOS/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-baseos-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-crb-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (CRB) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/CRB/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-crb-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (CRB) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/CRB/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-crb-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (CRB) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/CRB/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-crb-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-highavailability-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (HighAvailability) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/HighAvailability/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-highavailability-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (HighAvailability) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/HighAvailability/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-highavailability-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (HighAvailability) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/HighAvailability/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-highavailability-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-resilientstorage-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (ResilientStorage) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/ResilientStorage/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-resilientstorage-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (ResilientStorage) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/ResilientStorage/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-resilientstorage-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (ResilientStorage) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/ResilientStorage/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-resilientstorage-intel-partner.repo
+RUN { \
+  echo "[RHEL-8-rt-partners]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (RT) - x86_64" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/RT/x86_64/os" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-rt-partners-debug]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (RT) - x86_64 - Debug" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/RT/x86_64/debug/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+  echo "[RHEL-8-rt-partners-source]" ; \
+  echo "name=Red Hat Enterprise Linux 8.0.0 Partners (RT) - Source" ; \
+  echo "baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.0.0-GA/RT/source/tree" ; \
+  echo "enabled=0" ; \
+  echo "gpgcheck=1" ; \
+  echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta" ; \
+  echo "skip_if_unavailable=1" ; \
+  echo "" ; \
+} > /etc/yum.repos.d/RHEL-8-rt-intel-partner.repo
+
+# Update package lists, and upgrade to the latest Red Hat packages
+RUN dnf clean all \
+  && dnf -y upgrade \
+  && dnf clean all
+
+# Agama specific content begins here
+#
+# Add Intel Graphics repository
+RUN { \
+  echo "[intel-graphics]" ; \
+  echo "name=Intel Graphics Drivers Repository" ; \
+  echo "baseurl=https://osgc.jf.intel.com/graphics/rhel/8.0-devel/" ; \
+  echo "sslverify=0" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=0" ; \
+} > /etc/yum.repos.d/intel-graphics.repo
+
+# Docker.solution based on the Intel-Media-SDK instructions available here:
+#
+# https://github.com/Intel-Media-SDK/MediaSDK/wiki/Build-and-use-ffmpeg-with-MediaSDK
+#
+# This should really be part of a multi-stage build so the final 
+# image isn't polluted with build artifacts
+#
+# NOTE: This image will only work with Ubuntu 19.04 (disco) and newer
+FROM agama-user AS solution-build
+
+# Install git and build tools, clone ffmpeg, and get ready to build it
+RUN dnf groupinstall -y 'Development Tools'
+
+# Clone ffmpeg
+# NOTE: This explicitly clones the FFMPEG_TAG_VERSION (see SOLUTIONS)
+RUN git clone --depth 1 --branch $FFMPEG_TAG_VERSION https://github.com/ffmpeg/ffmpeg /ffmpeg
+
+# Install all required common packages:
+# Adapted from 
+RUN dnf install -y \
+    libva-devel$LIBVA_DEV_VERSION \
+    intel-mediasdk-devel$INTEL_MEDIASDK_DEVEL_VERSION \
+    libva-utils$LIBVA_UTILS_VERSION \
+  && dnf clean
+
+ENV LIBVA_DRIVER_NAME=iHD
+
+# Build FFmpeg
+WORKDIR /ffmpeg
+
+RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \
+  && make -j $(nproc --all) \
+  && make install
+
+FROM agama-user
+
+ENV LIBVA_DRIVER_NAME=iHD
+
+# Update and install the Mesa, OpenCL, and Media from Agama
+#
+# NOTE: libva requires libpciaccess0, however it doesn't depend on it
+# so explicitly install it.
+#    intel-media-va-driver-non-free$INTEL_MEDIA_VA_DRIVER_NON_FREE_VERSION \
+RUN dnf install -y \
+    intel-media$INTEL_MEDIA_VERSION \
+    libva$LIBVA_VERSION \
+    intel-mediasdk$INTEL_MEDIASDK_VERSION \
+    libva-utils$LIBVA_UTILS_VERSION \
+    libpciaccess \
+    pciutils \
+  && dnf clean
+
+# Copy ffmpeg and ffprobe from build container
+COPY --from=solution-build /usr/local/bin/ /usr/local/bin/
+
+WORKDIR /home/agama
+
+# Copy boiler plate entry point
+COPY assets/ /assets/
+ENTRYPOINT [ "/assets/entry" ]
+
+# Ensure that each Docker container self-documents the 
+# versions included in it
+
+ENV AGAMA_VERSION=${AGAMA_VERSION}
+
+COPY MANIFEST SOLUTION Dockerfile /assets/
diff --git a/README.rhel-8.0.0 b/README.rhel-8.0.0
new file mode 100644
index 0000000..932534d
--- /dev/null
+++ b/README.rhel-8.0.0
@@ -0,0 +1,41 @@
+# Build the Red Hat 8.0 version...
+
+The Red Hat image isn't using the templates/* -- it was built as a POC to
+verify that our repositories are working correctly for Red Hat.
+
+```bash
+export $(grep ^FFMPEG SOLUTION)
+envsubst < Dockerfile.solution.rhel-8.0.0 > Dockerfile.rhel-8.0.0
+docker build . -f Dockerfile.rhel-8.0.0 -t intel-media-ffmpeg:rhel-8.0.0
+```
+
+
+# In a custom image...
+
+## Installing certificates
+
+This image isn't yet copying certificates which would
+allow internal signed certs to be used, so turn
+sslverify=0 on the repository.
+
+To install the certs would be something like:
+
+A. Copy ca certs to /etc/pki/ca-trust/source/anchors/
+B. run update-ca-trust
+
+## Installing the Intel Graphics Driver repository for Red Hat 8.0
+
+cat << EOF > /etc/yum.repos.d/intel-graphics.repo
+[intel-graphics]
+name=Intel Graphics Drivers Repository
+baseurl=https://osgc.jf.intel.com/graphics/rhel/8.0-devel/
+sslverify=0
+enabled=1
+gpgcheck=0
+EOF
+
+## Configure YUM to not use the proxy for .intel.com domains
+echo "no_proxy=.jf.intel.com" >> /etc/yum.conf
+
+## Install some packages
+dnf install intel-opencl