diff --git a/trymos/image_build/files/usr/share/trymos/environment/amazon b/trymos/image_build/files/usr/share/trymos/environment/amazon
index 67324b4..b6039a4 100644
--- a/trymos/image_build/files/usr/share/trymos/environment/amazon
+++ b/trymos/image_build/files/usr/share/trymos/environment/amazon
@@ -1,7 +1,4 @@
 export NTP_SERVERS=169.254.169.123
-export DOCKER_EE_URL=https://storebits.docker.com/ubuntu
-export DOCKER_UCP_VERSION=3.3.6
-export DOCKER_UCP_IMAGE=mirantis.azurecr.io/lcm/docker/ucp:${DOCKER_UCP_VERSION}
 export MIRANTIS_ARTIFACTORY_URL=https://binary.mirantis.com
 export CEPH_STORAGE_OSD_DEVICE="xvdb"
 export CEPH_CLUSTER_FILE="${RELEASE_OPENSTACK_K8S}/examples/miraceph/aio-ceph_local_drives_openstack.yaml"
diff --git a/trymos/image_build/files/usr/share/trymos/environment/virtualbox b/trymos/image_build/files/usr/share/trymos/environment/virtualbox
index df6e3e8..ab34e82 100644
--- a/trymos/image_build/files/usr/share/trymos/environment/virtualbox
+++ b/trymos/image_build/files/usr/share/trymos/environment/virtualbox
@@ -1,7 +1,4 @@
 export NTP_SERVERS=169.254.169.123
-export DOCKER_EE_URL=https://storebits.docker.com/ubuntu
-export DOCKER_UCP_VERSION=3.3.6
-export DOCKER_UCP_IMAGE=mirantis.azurecr.io/lcm/docker/ucp:${DOCKER_UCP_VERSION}
 export MIRANTIS_ARTIFACTORY_URL=https://binary.mirantis.com
 export CEPH_STORAGE_OSD_DEVICE="sdb"
 export CEPH_CLUSTER_FILE="${RELEASE_OPENSTACK_K8S}/examples/miraceph/aio-ceph_local_drives_openstack.yaml"
diff --git a/trymos/image_build/files/usr/share/trymos/launch.sh b/trymos/image_build/files/usr/share/trymos/launch.sh
index 33025d3..12570a7 100755
--- a/trymos/image_build/files/usr/share/trymos/launch.sh
+++ b/trymos/image_build/files/usr/share/trymos/launch.sh
@@ -39,6 +39,7 @@
     exit 1
 fi
 
+source $_ENVIRONMENT_FOLDER/common
 source /usr/share/trymos/functions
 
 export STORAGE_CLUSTER_CIDR=${CONTROL_NETWORK_CIDR}
@@ -377,6 +378,7 @@
 ############### Components Versions ################
 
 OS:                       ${distro_info}
+TryMOS Version:           ${TRYMOS_VERSION}
 OpenStack Controller:     ${os_controller_version}
 Ceph Controller:          ${ceph_controller_version}
 OpenStack Version:        ${os_version}
diff --git a/trymos/image_build/template.json b/trymos/image_build/template.json
index d889b97..20d12e1 100644
--- a/trymos/image_build/template.json
+++ b/trymos/image_build/template.json
@@ -33,6 +33,11 @@
       "type": "file",
       "source": "files/etc/",
       "destination": "/etc"
+    },
+    {
+      "type": "file",
+      "source": "./release-openstack-k8s/trymos/files/environment/common",
+      "destination": "/usr/share/trymos/environment/common"
     }
   ],
   "builders": [