diff --git a/Dockerfile.rhel-8.0 b/Dockerfile.rhel-8.0
deleted file mode 100644
index 31491a4..0000000
--- a/Dockerfile.rhel-8.0
+++ /dev/null
@@ -1,364 +0,0 @@
-#
-# DO NOT EDIT THIS DOCKERFILE
-#
-# This file is auto-generated via scripts/build-dockerfile
-# by using environment substitution while concatenating the
-# contents of templates/*, and then adding the contents
-# of Dockerfile.solution.rhel-8.0
-#
-# Most solution specific changes should be isolated in
-# Dockerfile.solution.rhel-8.0. After making changes, you can then re-run
-# scripts/build-dockerfile
-#
-
-#
-# Template from templates/rhel/00-from.in
-#
-# Pull internal RHEL image
-FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/rhel:8.0.0 AS xe-base-stage
-
-# Flush cached package lists to prevent stale data
-RUN dnf clean all
-
-
-#
-# Template from templates/rhel/05-intel-proxy.in
-#
-# Configure Intel proxy values
-
-ARG http_proxy="http://proxy-chain.intel.com:911/"
-ARG https_proxy="http://proxy-chain.intel.com:912/"
-ARG ftp_proxy="ftp://proxy-chain.intel.com:911/"
-ARG socks_proxy="socks://proxy-chain.intel.com:1080/"
-ARG no_proxy="localhost,*.*.intel.com"
-
-ENV http_proxy="${http_proxy}"
-ENV https_proxy="${https_proxy}"
-ENV no_proxy="${no_proxy}"
-ENV ftp_proxy="${http_proxy}"
-ENV socks_proxy="${socks_proxy}"
-
-ENV HTTP_PROXY="${http_proxy}"
-ENV HTTPS_PROXY="${http_proxy}"
-ENV NO_PROXY="${no_proxy}"
-
-# Configure DNF and YUM proxies
-RUN { \
-  echo "proxy=${http_proxy}" ; \
-  echo "no_proxy=${no_proxy}" ; \
-} | tee -a /etc/dnf/dnf.conf /etc/yum.conf
-
-#
-# Template from templates/rhel/10-rhel-partner.in
-#
-# 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
-
-#
-# Template from templates/rhel/15-upgrade.in
-#
-# Update package lists, and upgrade to the latest packages
-#
-# Failure to do this will result in GPG errors later
-RUN dnf clean all \
-  && dnf -y upgrade
-
-
-#
-# Template from templates/rhel/20-repositories-intel-com.in
-#
-# repositories.intel.com content begins here
-#
-# Intel certificates which would allow internal signed certs to be
-# used are not being installed, 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
-#
-# Once that is done, the 'sslverify=0' can be removed from 
-# the repository definition below.
-#
-# Add Intel Graphics repository
-#
-RUN { \
-  echo "[intel-graphics]" ; \
-  echo "name=Intel Graphics Drivers Repository" ; \
-  echo "baseurl=https://osgc.jf.intel.com/internal/rhel/8.0/" ; \
-  echo "sslverify=0" ; \
-  echo "enabled=1" ; \
-  echo "gpgcheck=0" ; \
-} > /etc/yum.repos.d/intel-graphics.repo
-
-#
-# Template from templates/rhel/25-create-user.in
-#
-# Create user 'user' and add them to 'sudo' for sudo access and set
-# the passwd to 'user'
-
-FROM xe-base-stage AS xe-user-stage
-
-RUN dnf install -y sudo
-
-# NOTE: Requires 'sudo' package to already be installed
-RUN groupadd -r user \
-  && useradd --no-log-init \
-    -s /bin/bash \
-    -r -m \
-    -g user \
-    -G wheel,video \
-    -p $(echo "user" | openssl passwd -stdin) user
-
-# Set 'wheel' to NOPASSWD for all container users
-RUN sed -i -e 's,%wheel.*,%wheel ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
-
-USER user
-
-#
-# Template from templates/rhel/30-clean-up.in
-#
-# Clean dnf cache
-RUN dnf clean all
-
-#
-# Solution begins here (from Dockerfile.solution.rhel-8.0)
-#
-# 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 (eoan) and newer
-FROM xe-user-stage AS solution-build
-
-USER root
-
-# Install git and build tools, clone ffmpeg, and get ready to build it
-RUN dnf groupinstall -y 'Development Tools'
-
-# 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
-
-USER user
-
-# 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 /home/user/ffmpeg
-
-# Build FFmpeg
-WORKDIR /home/user/ffmpeg
-
-ENV LIBVA_DRIVER_NAME=iHD
-
-RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \
-  && make -j $(nproc --all) \
-  && sudo make install
-
-FROM xe-user-stage
-
-USER root
-
-# Update and install the Mesa, OpenCL, and Media from repositories.intel.com
-#
-# NOTE: libva requires libpciaccess0, however it doesn't depend on it
-#       so explicitly install it.
-RUN dnf install -y \
-    intel-media$INTEL_MEDIA_VERSION \
-    libva$LIBVA_VERSION \
-    intel-mediasdk$INTEL_MEDIASDK_VERSION \
-    libva-utils$LIBVA_UTILS_VERSION \
-    libpciaccess \
-    pciutils
-
-# Copy ffmpeg and ffprobe from build container
-COPY --from=solution-build /usr/local/bin/ /usr/local/bin/
-
-RUN dnf clean all
-
-ENV LIBVA_DRIVER_NAME=iHD
-
-USER user
-
-#
-# Standard ending begins here (from templates/ending.in)
-#
-# NOTE: This should be added as the last template entry
-# as it will always modify a layer (since the Dockerfile
-# changes,) causing all subsequent layers to be 
-# regenerated.
-
-# Copy boiler plate entry point
-COPY assets/ /assets/
-ENTRYPOINT [ "/assets/entry" ]
-
-# Ensure that each Docker container self-documents the 
-# versions included in it
-COPY SOLUTION /assets/
-COPY MANIFEST /assets/
-COPY Dockerfile.rhel-8.0 /assets/Dockerfile
diff --git a/Dockerfile.rhel-8.1 b/Dockerfile.rhel-8.1
new file mode 100644
index 0000000..d1f5c46
--- /dev/null
+++ b/Dockerfile.rhel-8.1
@@ -0,0 +1,368 @@
+#
+# DO NOT EDIT THIS DOCKERFILE
+#
+# This file is auto-generated via scripts/build-dockerfile
+# by using environment substitution while concatenating the
+# contents of templates/*, and then adding the contents
+# of Dockerfile.solution.rhel-8.1
+#
+# Most solution specific changes should be isolated in
+# Dockerfile.solution.rhel-8.1. After making changes, you can then re-run
+# scripts/build-dockerfile
+#
+
+#
+# Template from templates/rhel/00-from.in
+#
+# Pull internal RHEL image
+FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/rhel:8.1.0 AS xe-base-stage
+
+# Flush cached package lists to prevent stale data
+RUN dnf clean all
+
+
+#
+# Template from templates/rhel/05-intel-proxy.in
+#
+# Configure Intel proxy values
+
+ARG http_proxy="http://proxy-chain.intel.com:911/"
+ARG https_proxy="http://proxy-chain.intel.com:912/"
+ARG ftp_proxy="ftp://proxy-chain.intel.com:911/"
+ARG socks_proxy="socks://proxy-chain.intel.com:1080/"
+ARG no_proxy="localhost,*.*.intel.com"
+
+ENV http_proxy="${http_proxy}"
+ENV https_proxy="${https_proxy}"
+ENV no_proxy="${no_proxy}"
+ENV ftp_proxy="${http_proxy}"
+ENV socks_proxy="${socks_proxy}"
+
+ENV HTTP_PROXY="${http_proxy}"
+ENV HTTPS_PROXY="${http_proxy}"
+ENV NO_PROXY="${no_proxy}"
+
+# Configure DNF and YUM proxies
+RUN { \
+  echo "proxy=${http_proxy}" ; \
+  echo "no_proxy=${no_proxy}" ; \
+} | tee -a /etc/dnf/dnf.conf /etc/yum.conf
+
+#
+# Template from templates/rhel/10-rhel-partner.in
+#
+RUN { \
+  echo '#[RHEL-8-baseos-intel-OSTC]' ; \
+  echo '#baseurl=https://linux-ftp.ostc.intel.com/pub/ISO/redhat/redhat-rhel/RHEL-8.0.0-GA/BaseOS/x86_64/os/' ; \
+  echo '#enabled=1' ; \
+  echo '#sslverify=0' ; \
+  echo '#skip_if_unavailable=1' ; \
+  echo '' ; \
+} > /etc/yum.repos.d/intel-ostc-example.repo
+RUN { \
+  echo '[RHEL-8-appstream-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (AppStream) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/AppStream/$basearch/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.1.0 Partners (AppStream) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/AppStream/$basearch/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.1.0 Partners (AppStream) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+RUN { \
+  echo '[RHEL-8-baseos-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (BaseOS) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/BaseOS/$basearch/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.1.0 Partners (BaseOS) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/BaseOS/$basearch/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.1.0 Partners (BaseOS) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+RUN { \
+  echo '[RHEL-8-crb-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (CRB) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/CRB/$basearch/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.1.0 Partners (CRB) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/CRB/$basearch/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.1.0 Partners (CRB) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+RUN { \
+  echo '[RHEL-8-highavailability-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (HighAvailability) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/HighAvailability/$basearch/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.1.0 Partners (HighAvailability) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/HighAvailability/$basearch/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.1.0 Partners (HighAvailability) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+RUN { \
+  echo '[RHEL-8-resilientstorage-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (ResilientStorage) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/ResilientStorage/$basearch/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.1.0 Partners (ResilientStorage) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/ResilientStorage/$basearch/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.1.0 Partners (ResilientStorage) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+RUN { \
+  echo '[RHEL-8-rt-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (RT) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/RT/$basearch/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.1.0 Partners (RT) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/RT/$basearch/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.1.0 Partners (RT) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+
+#
+# Template from templates/rhel/15-upgrade.in
+#
+# Update package lists, and upgrade to the latest packages
+#
+# Failure to do this will result in GPG errors later
+RUN dnf clean all \
+  && dnf -y upgrade
+
+
+#
+# Template from templates/rhel/20-repositories-intel-com.in
+#
+# repositories.intel.com content begins here
+#
+# Intel certificates which would allow internal signed certs to be
+# used are not being installed, 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
+#
+# Once that is done, the 'sslverify=0' can be removed from 
+# the repository definition below.
+#
+# Add Intel Graphics repository
+#
+RUN { \
+  echo "[intel-graphics]" ; \
+  echo "name=Intel Graphics Drivers Repository" ; \
+  echo "baseurl=https://osgc.jf.intel.com/internal/rhel/8.1/" ; \
+  echo "sslverify=0" ; \
+  echo "enabled=1" ; \
+  echo "gpgcheck=0" ; \
+} > /etc/yum.repos.d/intel-graphics.repo
+
+#
+# Template from templates/rhel/25-create-user.in
+#
+# Create user 'user' and add them to 'sudo' for sudo access and set
+# the passwd to 'user'
+
+FROM xe-base-stage AS xe-user-stage
+
+RUN dnf install -y sudo
+
+# NOTE: Requires 'sudo' package to already be installed
+RUN groupadd -r user \
+  && useradd --no-log-init \
+    -s /bin/bash \
+    -r -m \
+    -g user \
+    -G wheel,video \
+    -p $(echo "user" | openssl passwd -stdin) user
+
+# Set 'wheel' to NOPASSWD for all container users
+RUN sed -i -e 's,%wheel.*,%wheel ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
+
+USER user
+
+#
+# Template from templates/rhel/30-clean-up.in
+#
+# Clean dnf cache
+RUN dnf clean all
+
+#
+# Solution begins here (from Dockerfile.solution.rhel-8.1)
+#
+# 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 (eoan) and newer
+FROM xe-user-stage AS solution-build
+
+USER root
+
+# Install git and build tools, clone ffmpeg, and get ready to build it
+RUN dnf groupinstall -y 'Development Tools'
+
+# 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
+
+USER user
+
+# 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 /home/user/ffmpeg
+
+# Build FFmpeg
+WORKDIR /home/user/ffmpeg
+
+ENV LIBVA_DRIVER_NAME=iHD
+
+RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \
+  && make -j $(nproc --all) \
+  && sudo make install
+
+FROM xe-user-stage
+
+USER root
+
+# Update and install the Mesa, OpenCL, and Media from repositories.intel.com
+#
+# NOTE: libva requires libpciaccess0, however it doesn't depend on it
+#       so explicitly install it.
+RUN dnf install -y \
+    intel-media$INTEL_MEDIA_VERSION \
+    libva$LIBVA_VERSION \
+    intel-mediasdk$INTEL_MEDIASDK_VERSION \
+    libva-utils$LIBVA_UTILS_VERSION \
+    libpciaccess \
+    pciutils
+
+# Copy ffmpeg and ffprobe from build container
+COPY --from=solution-build /usr/local/bin/ /usr/local/bin/
+
+RUN dnf clean all
+
+ENV LIBVA_DRIVER_NAME=iHD
+
+USER user
+
+#
+# Standard ending begins here (from templates/ending.in)
+#
+# NOTE: This should be added as the last template entry
+# as it will always modify a layer (since the Dockerfile
+# changes,) causing all subsequent layers to be 
+# regenerated.
+
+# Copy boiler plate entry point
+COPY assets/ /assets/
+ENTRYPOINT [ "/assets/entry" ]
+
+# Ensure that each Docker container self-documents the 
+# versions included in it
+COPY SOLUTION /assets/
+COPY MANIFEST /assets/
+COPY Dockerfile.rhel-8.1 /assets/Dockerfile
diff --git a/Dockerfile.solution.rhel-8.0 b/Dockerfile.solution.rhel-8.1
similarity index 100%
rename from Dockerfile.solution.rhel-8.0
rename to Dockerfile.solution.rhel-8.1
diff --git a/scripts/test-image.sh b/scripts/test-image.sh
index 5ff69fa..1d3d688 100755
--- a/scripts/test-image.sh
+++ b/scripts/test-image.sh
@@ -24,36 +24,75 @@ function fail {
 VIDEO=$(getent group video | sed -E 's,^video:[^:]*:([^:]*):.*$,\1,')
 RENDER=$(getent group render | sed -E 's,^render:[^:]*:([^:]*):.*$,\1,')
 
-docker pull ${REGISTRY_URL}/${CONTAINER}:${TAG} || fail "Unable to pull ${REGISTRY_URL}/${CONTAINER}:${TAG}"
+function usage {
+  cat << EOF
+usage: scripts/test-image.sh [OPTIONS]
+Options:
 
+  -l      Use the local image (vs. from ${REGISTRY})
+
+EOF
+}
+
+LOCAL=0
+while getopts l opt; do
+  case "${opt}" in
+  l)
+    LOCAL=1
+    ;;
+  [?])
+    >&2 echo -e "\nInvalid parameter: ${opt}\n"
+    usage >&2
+    exit 1
+    ;;
+  esac
+done
+shift $(( OPTIND-1 ))
+
+
+(( ! LOCAL )) && {
+  IMAGE=${REGISTRY_URL}/${CONTAINER}:${TAG}
+  docker pull ${IMAGE} || fail "Unable to pull ${IMAGE}"
+} || {
+  IMAGE=${CONTAINER}:${TAG}
+}
+
+# Take entry-point from command line arguments, or set to 'test'
+# if nothing provided
+ENTRY="${*}"
+[[ "${ENTRY}" == "" ]] && {
+  DOCKER_ARGS=""
+  ENTRY="test"
+} || {
+  DOCKER_ARGS="  -it --rm \
+"
+}
 
 [[ "${VIDEO}" != "" ]] || fail "No video group found."
 
 ADD_GROUPS="--group-add ${VIDEO}"
 [[ "${RENDER}" != "" ]] && ADD_GROUPS+=" --group-add ${RENDER}"
 
-[[ -e data/ ]] && rm -rf data
-
-mkdir data || fail "Unable to make data volume directory"
+[[ -e data/ ]] || mkdir data || fail "Unable to make data volume directory"
 chmod a+rwX data || fail "Unable to chmod data volume to a+rwX"
 
 CMD="docker run \
-  ${ADD_GROUPS} \
+  ${ADD_GROUPS} ${DOCKER_ARGS} \
   --rm \
   --device=/dev/dri \
   -v $(pwd)/data:/data \
-  ${REGISTRY_URL}/${CONTAINER}:${TAG} \
-  test"
+  ${IMAGE}"
 
 cat << EOF
 -------------------------------------------------------------------------------
 Running test with:
-
-video group GID: ${VIDEO}
-$( [[ "${RENDER}" != "" ]] && echo -e "render group GID: ${RENDER}\n" )
-${CMD}
+  video group GID: ${VIDEO}
+$( [[ "${RENDER}" != "" ]] && echo -e "  render group GID: ${RENDER}\n" )
+Running container via:
+$( echo "  ${CMD}   ${ENTRY}" | sed -e "s,   , \\\\\n    ,g")
 -------------------------------------------------------------------------------
 
 EOF
 
-${CMD} || fail "Unable to execute 'test' on ${REGISTRY_URL}/${CONTAINER}:${TAG}."
+${CMD} info || fail "Unable to execute 'info' on ${IMAGE}."
+${CMD} ${ENTRY} || fail "Unable to execute 'test' on ${IMAGE}."
diff --git a/scripts/trigger.sh b/scripts/trigger.sh
index a089bee..eb8f867 100755
--- a/scripts/trigger.sh
+++ b/scripts/trigger.sh
@@ -59,6 +59,12 @@ for var in ${VARS[@]}; do
   export ${var}
 done
 
+CURL=$(which curl)
+[[ "${CURL}" != "" ]] || {
+  2>&1 echo "'curl' not found. Please install via 'apt-get install curl' and try again."
+  exit 1
+}
+
 # The following constants are used so we can run trigger.sh
 # against a known build
 BUILD=${BUILD:-7517585}
diff --git a/templates/rhel/00-from.in b/templates/rhel/00-from.in
index 8a21fdf..693a045 100644
--- a/templates/rhel/00-from.in
+++ b/templates/rhel/00-from.in
@@ -1,5 +1,5 @@
 # Pull internal RHEL image
-FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/rhel:8.0.0 AS xe-base-stage
+FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/rhel:8.1.0 AS xe-base-stage
 
 # Flush cached package lists to prevent stale data
 RUN dnf clean all
diff --git a/templates/rhel/10-rhel-partner.in b/templates/rhel/10-rhel-partner.in
index e8f4982..5a397cc 100644
--- a/templates/rhel/10-rhel-partner.in
+++ b/templates/rhel/10-rhel-partner.in
@@ -1,160 +1,164 @@
-# 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
+  echo '#[RHEL-8-baseos-intel-OSTC]' ; \
+  echo '#baseurl=https://linux-ftp.ostc.intel.com/pub/ISO/redhat/redhat-rhel/RHEL-8.0.0-GA/BaseOS/x86_64/os/' ; \
+  echo '#enabled=1' ; \
+  echo '#sslverify=0' ; \
+  echo '#skip_if_unavailable=1' ; \
+  echo '' ; \
+} > /etc/yum.repos.d/intel-ostc-example.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
+  echo '[RHEL-8-appstream-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (AppStream) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/AppStream/$basearch/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.1.0 Partners (AppStream) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/AppStream/$basearch/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.1.0 Partners (AppStream) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.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
+  echo '[RHEL-8-baseos-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (BaseOS) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/BaseOS/$basearch/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.1.0 Partners (BaseOS) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/BaseOS/$basearch/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.1.0 Partners (BaseOS) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.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
+  echo '[RHEL-8-crb-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (CRB) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/CRB/$basearch/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.1.0 Partners (CRB) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/CRB/$basearch/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.1.0 Partners (CRB) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.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
+  echo '[RHEL-8-highavailability-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (HighAvailability) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/HighAvailability/$basearch/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.1.0 Partners (HighAvailability) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/HighAvailability/$basearch/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.1.0 Partners (HighAvailability) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.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
+  echo '[RHEL-8-resilientstorage-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (ResilientStorage) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/ResilientStorage/$basearch/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.1.0 Partners (ResilientStorage) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/ResilientStorage/$basearch/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.1.0 Partners (ResilientStorage) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo
+RUN { \
+  echo '[RHEL-8-rt-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.1.0 Partners (RT) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/RT/$basearch/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.1.0 Partners (RT) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/RT/$basearch/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.1.0 Partners (RT) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.1.0-RC-1.1/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.repo