diff --git a/build-openstack-debian-image b/build-openstack-debian-image
index 582c7919fbca580ba4f2d31ace4219dd405597e8..9d13b123efcd4a1cd769e14ecd6fa773507a142a 100755
--- a/build-openstack-debian-image
+++ b/build-openstack-debian-image
@@ -1150,7 +1150,7 @@ deb-src ${SOURCE_LIST_MIRROR}-azure jessie-backports main${NON_FREE}
 " >>${MOUNT_DIR}/etc/apt/sources.list
 fi
 
-if [ "${AZURE}" = "yes" ] ; then
+if [ "${RELEASE}" = "jessie" ] && [ "${AZURE}" = "yes" ] ; then
 	chroot ${MOUNT_DIR} apt-key add - <<EOF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
@@ -1176,7 +1176,7 @@ EOF
 fi
 
 chroot ${MOUNT_DIR} apt-get update
-if [ "${AZURE}" = "yes" ] ; then
+if [ "${RELEASE}" = "jessie" ] && [ "${AZURE}" = "yes" ] ; then
 	chroot ${MOUNT_DIR} apt-get install -y -o Dpkg::Options::="--force-confnew" debian-azure-archive-keyring unscd
 	chroot ${MOUNT_DIR} apt-get update
 fi