diff --git a/SOLUTION b/SOLUTION
index a4910f0..59bcd78 100644
--- a/SOLUTION
+++ b/SOLUTION
@@ -3,5 +3,7 @@ CONTAINER=intel-media-ffmpeg
 OS_DISTRO=ubuntu
 OS_RELEASE=disco
 FFMPEG_TAG_VERSION=n4.2.1
+PACKAGE_KEYFILE=http://osgc.jf.intel.com/packages/agama/ubuntu/aptly_repo_signing.key
 PACKAGE_REPOSITORY=http://osgc.jf.intel.com/packages/agama/${OS_DISTRO}
+#PACKAGE_KEYFILE=http://repositories.intel.com/graphics/ubuntu/repository.key
 #PACKAGE_REPOSITORY=http://repositories.intel.com/graphics/${OS_DISTRO}
diff --git a/templates/20-agama-packages.in b/templates/20-agama-packages.in
index 9d9d636..5744aaa 100644
--- a/templates/20-agama-packages.in
+++ b/templates/20-agama-packages.in
@@ -9,11 +9,11 @@ RUN apt-get -q update \
   && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
 
 # Fetch and install the signing key for OSGC's Agama repository
-#RUN wget --no-proxy --quiet -O /tmp/repositories.key http://repositories.intel.com/graphics/ubuntu/repository.key \
-#  && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
-#  && rm /tmp/repositories.key
+RUN wget --no-proxy --quiet -O /tmp/repositories.key ${PACKAGE_KEYFILE} \
+  && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
+  && rm /tmp/repositories.key
 
 # Add internal Agama repository
-RUN apt-add-repository "deb [trusted=yes arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main"
+RUN apt-add-repository "deb [arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main"
 
 RUN apt-get remove -y wget