diff --git a/Dockerfile b/Dockerfile
index 0e58f61..a525fd1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,14 @@ FROM amr-registry.caas.intel.com/vtt-osgc/os/ubuntu:disco AS base
 # Pre-install proxy configuration values
 #
 # This uses the linux-ftp.ostc.intel.com as a mirror.
+RUN { \
+  for suite in disco disco-updates disco-security disco-backports; do \
+    for component in main restricted universe multiverse; do \
+      echo "deb http://linux-ftp.ostc.intel.com/pub/mirrors/ubuntu ${suite} ${component}" ; \
+    done \
+  done \
+} > /etc/apt/sources.list
+
 RUN { \
   echo "Acquire::http::proxy \"http://proxy-chain.intel.com:911/\";\n" ; \
   echo "Acquire::https::proxy \"http://proxy-chain.intel.com:912/\";\n" ; \
@@ -104,7 +112,7 @@ FROM base AS agama
 #RUN apt-get remove -y wget
 
 # Install repository as trusted until we have a signed repository:
-RUN echo "deb [trusted=yes arch=amd64] https://osgc.jf.intel.com/graphics/ubuntu disco main" > /etc/apt/sources.list.d/intel-graphics.list
+RUN echo "deb [trusted=yes arch=amd64] https://osgc.jf.intel.com/graphics/ubuntu disco-devel main" > /etc/apt/sources.list.d/intel-graphics.list
 
 
 
@@ -160,10 +168,10 @@ RUN git clone --depth 1 --branch n4.2.1 https://github.com/ffmpeg/ffmpeg /home/a
 # Install all required common packages:
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get -q -y install \
-    libva-dev \
-    libmfx-dev \
-    libmfx1 \
-    vainfo \
+    libva-dev$LIBVA_DEV_VERSION \
+    libmfx-dev$LIBMFX_DEV_VERSION \
+    libmfx1$LIBMFX1_VERSION \
+    vainfo$VAINFO_VERSION \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
@@ -186,10 +194,10 @@ ENV LIBVA_DRIVER_NAME=iHD
 # so explicitly install it.
 RUN apt-get -q update \
   && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
-    intel-media-va-driver-non-free \
-    libva2 \
-    libmfx1 \
-    vainfo \
+    intel-media-va-driver-non-free$INTEL_MEDIA_VA_DRIVER_NON_FREE_VERSION \
+    libva2$LIBVA2_VERSION \
+    libmfx1$LIBMFX1_VERSION \
+    vainfo$VAINFO_VERSION \
     libpciaccess0 \
     pciutils \
   && apt-get clean \
diff --git a/SOLUTION b/SOLUTION
index 66f898e..51b49ac 100644
--- a/SOLUTION
+++ b/SOLUTION
@@ -3,7 +3,7 @@ REPO_URL=${REPO_URL:-amr-registry.caas.intel.com/vtt-osgc/solutions}
 CONTAINER=$(basename ${PWD})
 OS_DISTRO=${OS_DISTRO:-ubuntu}
 OS_RELEASE=${OS_RELEASE:-disco}
-PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}}
+PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}-devel}
 PACKAGE_KEYFILE=https://osgc.jf.intel.com/graphics/ubuntu/aptly_repo_signing.key
 #PACKAGE_REPOSITORY=http://dvgo6jxukvox2.cloudfront.net/graphics/${OS_DISTRO}
 PACKAGE_REPOSITORY=https://osgc.jf.intel.com/graphics/${OS_DISTRO}