diff --git a/SOLUTION b/SOLUTION
index ce9a1ad..f955e15 100644
--- a/SOLUTION
+++ b/SOLUTION
@@ -1,8 +1,9 @@
-REPO_URL=amr-registry.caas.intel.com/vtt-osgc/solutions
-CONTAINER=intel-media-ffmpeg
-OS_DISTRO=ubuntu
-OS_RELEASE=disco
 FFMPEG_TAG_VERSION=n4.2.1
+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_KEYFILE=http://osgc.jf.intel.com/graphics/ubuntu/aptly_repo_signing.key
 PACKAGE_REPOSITORY=http://osgc.jf.intel.com/graphics/${OS_DISTRO}
 #PACKAGE_KEYFILE=http://repositories.intel.com/graphics/ubuntu/repository.key