diff --git a/Dockerfile.rhel-8.1 b/Dockerfile.rhel-8.1
deleted file mode 100644
index 3457a91..0000000
--- a/Dockerfile.rhel-8.1
+++ /dev/null
@@ -1,368 +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.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-devel/" ; \
-  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/scripts/build-dockerfile.sh b/scripts/build-dockerfile.sh
index f59d1d5..3cabdb6 100755
--- a/scripts/build-dockerfile.sh
+++ b/scripts/build-dockerfile.sh
@@ -87,6 +87,9 @@ SNIPPETS=()
 
 # Create a list of all the templates for this distro
 for snippet in templates/${OS_DISTRO}/??-*.in; do
+  if [[ "${TEMPLATE_IGNORE}" != "" ]] && [[ ${snippet} =~ ${TEMPLATE_IGNORE} ]]; then
+    continue
+  fi
   SNIPPETS+=($snippet)
 done
 
@@ -94,6 +97,9 @@ done
 # removing from the base distro if a name conflict
 [[ -d templates/${OS_DISTRO}/${OS_RELEASE} ]] && {
   for snippet in templates/${OS_DISTRO}/${OS_RELEASE}/??-*.in; do
+    if [[ "${TEMPLATE_IGNORE}" != "" ]] && [[ ${snippet} =~ ${TEMPLATE_IGNORE} ]]; then
+      continue
+    fi
     SNIPPETS=(${SNIPPETS[@]%%*$(basename ${snippet})})
     SNIPPETS+=($snippet)
   done
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index d31ecdb..f2f3f9b 100755
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -18,23 +18,30 @@ RELEASE_INFO=${RELEASE_INFO:-N/A}
   TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
 }
 
-SOLUTION_SUFFIX=".${OS_DISTRO}-${OS_RELEASE}"
 [[ -d "templates/${OS_DISTRO}" ]] || {
   echo "Unrecognized OS_DISTRO: '${OS_DISTRO}'"
   exit -1
 }
 
-[[ ! -e "Dockerfile${SOLUTION_SUFFIX}" ]] && {
+if [[ -e "Dockerfile.solution.${OS_DISTRO}-${OS_RELEASE}" ]]; then
+  SOLUTION_SUFFIX=".${OS_DISTRO}-${OS_RELEASE}"
+elif [[ -e "Dockerfile.solution.${OS_DISTRO}" ]]; then
+  SOLUTION_SUFFIX=".${OS_DISTRO}"
+else
+  SOLUTION_SUFFIX=""
+fi
+
+[[ "${SOLUTION_SUFFIX}" == "" ]] && {
   cat << EOF
 
-OS_DISTRO and OS_RELEASE creates a solution suffix of '${OS_DISTRO}-${OS_RELEASE}'.
-However, Dockerfile${SOLUTION_SUFFIX} does not exist.
+The following Dockerfile.solutions were checked, but do not exist:
 
-Using 'Dockerfile' as default.
+* Dockerfile.solution.${OS_DISTRO}
+* Dockerfile.solution.${OS_DISTRO}-${OS_RELEASE}
+
+Using 'Dockerfile.solution' as default.
 
 EOF
-
-  SOLUTION_SUFFIX=""
 }
 
 export DOCKERFILE="Dockerfile${SOLUTION_SUFFIX}"
diff --git a/templates/centos/20-repositories-intel-com.in b/templates/centos/20-repositories-intel-com.in
index 4f5ca2c..e345ade 100644
--- a/templates/centos/20-repositories-intel-com.in
+++ b/templates/centos/20-repositories-intel-com.in
@@ -17,7 +17,7 @@
 RUN { \
   echo "[intel-graphics]" ; \
   echo "name=Intel Graphics Drivers Repository" ; \
-  echo "baseurl=${PACKAGE_REPOSITORY}/${OS_DISTRO}/${PACKAGE_STREAM}/" ; \
+  echo "baseurl=${PACKAGE_REPOSITORY}/${PACKAGE_DISTRO}/${PACKAGE_STREAM}/" ; \
   echo "sslverify=0" ; \
   echo "enabled=1" ; \
   echo "gpgcheck=0" ; \
diff --git a/templates/centos/25-create-user.in b/templates/centos/25-create-user.in
index 0ef9ba3..4fdb0e7 100644
--- a/templates/centos/25-create-user.in
+++ b/templates/centos/25-create-user.in
@@ -3,7 +3,8 @@
 
 FROM xe-base-stage AS xe-user-stage
 
-RUN dnf install -y sudo
+# CentOS doesn't provide openssl by default. Red Hat does.
+RUN dnf install -y sudo openssl
 
 # NOTE: Requires 'sudo' package to already be installed
 RUN groupadd -r user \
diff --git a/templates/rhel/00-from.in b/templates/rhel/00-from.in
index 8a21fdf..8c184e7 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:${OS_RELEASE}.0 AS xe-base-stage
 
 # Flush cached package lists to prevent stale data
 RUN dnf clean all
diff --git a/templates/rhel/8.1/10-rhel-partner.in b/templates/rhel/8.1/10-rhel-partner.in
new file mode 100644
index 0000000..8b5bf83
--- /dev/null
+++ b/templates/rhel/8.1/10-rhel-partner.in
@@ -0,0 +1,331 @@
+# Remove any pre-configured repositories
+RUN rm -rf /etc/yum.repos.d/*
+
+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
+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
diff --git a/templates/rhel/8.2/10-rhel-partner.in b/templates/rhel/8.2/10-rhel-partner.in
new file mode 100644
index 0000000..82d0556
--- /dev/null
+++ b/templates/rhel/8.2/10-rhel-partner.in
@@ -0,0 +1,170 @@
+# Remove any pre-configured repositories
+RUN rm -rf /etc/yum.repos.d/*
+
+# Partner keys from:
+# https://gitlab.devtools.intel.com/vtt/sws/gfx-build-docker-images
+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.2.0 Partners (AppStream) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (AppStream) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (AppStream) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (BaseOS) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (BaseOS) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (BaseOS) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (CRB) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (CRB) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (CRB) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (HighAvailability) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (HighAvailability) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (HighAvailability) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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 '' ; \
+  echo '' ; \
+} > /etc/yum.repos.d/RHEL-8-highavailability.repo
+RUN { \
+  echo '[RHEL-8-resilientstorage-partners]' ; \
+  echo 'name=Red Hat Enterprise Linux 8.2.0 Partners (ResilientStorage) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (ResilientStorage) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (ResilientStorage) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (RT) - $basearch' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (RT) - $basearch - Debug' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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.2.0 Partners (RT) - Source' ; \
+  echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.2.0-RC-1.3/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
diff --git a/templates/rhel/README.md b/templates/rhel/README.md
new file mode 100644
index 0000000..b0407a5
--- /dev/null
+++ b/templates/rhel/README.md
@@ -0,0 +1,31 @@
+# To upgrade to a minor release
+
+Generate a new 10-rhel-partner.in file, which assumes we have
+build containers already for the target distro and the partner 
+keys exist in:
+
+https://gitlab.devtools.intel.com/vtt/sws/gfx-build-docker-images
+
+```bash
+export OS_RELEASE=8.2
+git clone --depth=1 --branch=master \
+  https://gitlab.devtools.intel.com/vtt/sws/gfx-build-docker-images tmp
+TARGET=${OS_RELEASE}/10-rhel-partner.in
+REPOS=tmp/rhel-${OS_RELEASE}/dockerfiles/
+[ ! -d $(dirname ${TARGET}) ] && mkdir $(dirname ${TARGET})
+
+cat << EOF > ${TARGET}
+# Remove any pre-configured repositories
+RUN rm -rf /etc/yum.repos.d/*
+
+# Partner keys from:
+# https://gitlab.devtools.intel.com/vtt/sws/gfx-build-docker-images
+EOF
+
+for repo in ${REPOS}/*.repo; do
+echo "RUN { \\"
+cat "${repo}" | while read line; do echo "  echo '${line//\"/\\\"}' ; \\"; done
+echo "} > /etc/yum.repos.d/$(basename ${repo})"
+done >> ${TARGET}
+rm -rf tmp
+```
diff --git a/templates/ubuntu/25-create-user.in b/templates/ubuntu/25-create-user.in
index 4410873..2df6ead 100644
--- a/templates/ubuntu/25-create-user.in
+++ b/templates/ubuntu/25-create-user.in
@@ -8,11 +8,17 @@ RUN apt-get -q update \
   && apt-get install --no-install-recommends -y \
       sudo
 
+ARG USER_UID=1000
+ARG USER_GID=1000
+
+RUN echo "Creating 'user': $USER_UID:$USER_GID"
+
 # NOTE: Requires 'sudo' package to already be installed
-RUN groupadd -r user \
+RUN groupadd -g $USER_GID user \
   && useradd --no-log-init \
     -s /bin/bash \
-    -r -m \
+    -m \
+    -u $USER_UID \
     -g user \
     -G sudo,video \
     -p $(echo "user" | openssl passwd -stdin) user