diff --git a/Dockerfile b/Dockerfile
index 4e22d50..e169150 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -253,13 +253,6 @@ ENTRYPOINT [ "/assets/entry" ]
 
 # Ensure that each Docker container self-documents the 
 # versions included in it
-
-RUN { \
-  echo "PACKAGE_REPOSITORY=https://osgc.jf.intel.com/internal" ; \
-  echo "RELEASE_INFO=N/A" ; \
-  echo "PACKAGE_STREAM=eoan" ; \
-  echo "OS_DISTRO=ubuntu" ; \
-  echo "OS_RELEASE=eoan" ; \
-} | tee /assets/SOLUTION
+COPY SOLUTION /assets/
 COPY MANIFEST /assets/
 COPY Dockerfile /assets/Dockerfile
diff --git a/templates/ending.in b/templates/ending.in
index 57cdaf2..e29da96 100644
--- a/templates/ending.in
+++ b/templates/ending.in
@@ -9,13 +9,6 @@ ENTRYPOINT [ "/assets/entry" ]
 
 # Ensure that each Docker container self-documents the 
 # versions included in it
-
-RUN { \
-  echo "PACKAGE_REPOSITORY=${PACKAGE_REPOSITORY}" ; \
-  echo "RELEASE_INFO=${RELEASE_INFO}" ; \
-  echo "PACKAGE_STREAM=${PACKAGE_STREAM}" ; \
-  echo "OS_DISTRO=${OS_DISTRO}" ; \
-  echo "OS_RELEASE=${OS_RELEASE}" ; \
-} | tee /assets/SOLUTION
+COPY SOLUTION /assets/
 COPY MANIFEST /assets/
 COPY ${DOCKERFILE} /assets/Dockerfile