diff --git a/templates/20-agama-packages.in b/templates/20-agama-packages.in
index 7d6fba1..9d9d636 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/aptly.key http://osgc.jf.intel.com/packages/agama/ubuntu/aptly_repo_signing.key \
-  && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/aptly.key \
-  && rm /tmp/aptly.key
+#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
 
 # Add internal Agama repository
-RUN apt-add-repository "deb [arch=amd64] http://osgc.jf.intel.com/packages/agama/ubuntu disco main"
+RUN apt-add-repository "deb [trusted=yes arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main"
 
 RUN apt-get remove -y wget