diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index 5307e16..06f47c1 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -46,6 +46,8 @@
     default: ''
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   docker_ucp_image:
@@ -76,6 +78,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
index caa3ff5..7c88e3d 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -70,6 +70,8 @@
     default: ''
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   hardware_metadata:
@@ -93,6 +95,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $binary_base_url: { get_param: binary_base_url }
             $ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
index d143f7d..f2f4cd2 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -84,6 +84,8 @@
     default: ''
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   hardware_metadata:
@@ -114,6 +116,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index cd08194..cb37946 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -45,6 +45,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   docker_ucp_image:
@@ -95,6 +97,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $ucp_master_host: { get_param: ucp_master_host }
             $node_metadata: { get_param: metadata }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index 128ea7a..0e3a99d 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -69,6 +69,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   hardware_metadata:
@@ -104,6 +106,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index 9c62210..cc0e841 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -83,6 +83,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   hardware_metadata:
@@ -137,6 +139,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/multirack/CentralSite.yaml b/de/heat-templates/fragments/multirack/CentralSite.yaml
index e5f9c1e..c8b98b2 100644
--- a/de/heat-templates/fragments/multirack/CentralSite.yaml
+++ b/de/heat-templates/fragments/multirack/CentralSite.yaml
@@ -21,6 +21,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   docker_ucp_image:
@@ -167,6 +169,7 @@
       metadata: { get_param: ucp_metadata}
       docker_ee_url: { get_param: docker_ee_url }
       docker_ee_release: { get_param: docker_ee_release }
+      docker_ee_packages: { get_param: docker_ee_packages }
       docker_ucp_image: { get_param: docker_ucp_image}
       docker_default_address_pool: { get_param: docker_default_address_pool }
       node_type: "ucp"
@@ -197,6 +200,7 @@
           ucp_master_host: { get_attr: [ucp, server_control_ip] }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           node_type: "worker"
@@ -237,6 +241,7 @@
           ucp_master_host: { get_attr: [ucp, server_control_ip] }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           node_type: "worker"
diff --git a/de/heat-templates/fragments/multirack/Rack.yaml b/de/heat-templates/fragments/multirack/Rack.yaml
index 71a820e..cfbd1d7 100644
--- a/de/heat-templates/fragments/multirack/Rack.yaml
+++ b/de/heat-templates/fragments/multirack/Rack.yaml
@@ -25,6 +25,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   docker_ucp_image:
@@ -81,6 +83,7 @@
           metadata: { get_param: cmp_metadata}
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           node_type: "worker"
           kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
index 54cf445..cdaa49e 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
@@ -47,6 +47,8 @@
     type: string
   docker_ee_url:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ucp_image:
     type: string
     default: 'docker/ucp:3.2.4'
@@ -72,6 +74,7 @@
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
             $docker_ee_release: { get_param: docker_ee_release }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
             $node_metadata: { get_param: metadata }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
index deb88ea..5adf1f7 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
@@ -44,6 +44,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   docker_ucp_image:
@@ -101,6 +103,7 @@
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
             $docker_ee_release: { get_param: docker_ee_release }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
             $node_metadata: { get_param: metadata }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
index 05a6db3..9e09613 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
@@ -37,6 +37,8 @@
     type: string
   docker_ee_release:
     type: string
+  docker_ee_packages:
+    type: string
   docker_ee_url:
     type: string
   docker_ucp_image:
@@ -65,6 +67,7 @@
             $kubernetes_installer: { get_param: kubernetes_installer }
             $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
             $docker_ee_url: { get_param: docker_ee_url }
+            $docker_ee_packages: { get_param: docker_ee_packages }
             $docker_ee_release: { get_param: docker_ee_release }
             $ucp_master_host: { get_param: ucp_master_host }
             $docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/multirack.yaml b/de/heat-templates/multirack.yaml
index fcde637..27a50f9 100644
--- a/de/heat-templates/multirack.yaml
+++ b/de/heat-templates/multirack.yaml
@@ -128,6 +128,9 @@
   docker_ee_release:
     type: string
     default: 'stable-19.03'
+  docker_ee_packages:
+    type: string
+    default: 'docker-ee'
   docker_ucp_image:
     type: string
     default: 'docker/ucp:3.2.4'
@@ -245,6 +248,7 @@
       ucp_metadata: { get_param: ucp_metadata}
       docker_ee_url: { get_param: docker_ee_url }
       docker_ee_release: { get_param: docker_ee_release }
+      docker_ee_packages: { get_param: docker_ee_packages }
       docker_ucp_image: { get_param: docker_ucp_image}
       docker_default_address_pool: { get_param: docker_default_address_pool }
       key_name: { get_attr: [keypair_name, value] }
@@ -289,6 +293,7 @@
     properties:
       docker_ee_url: { get_param: docker_ee_url }
       docker_ee_release: { get_param: docker_ee_release }
+      docker_ee_packages: { get_param: docker_ee_packages }
       docker_ucp_image: { get_param: docker_ucp_image}
       docker_default_address_pool: { get_param: docker_default_address_pool }
       key_name: { get_attr: [keypair_name, value] }
@@ -323,6 +328,7 @@
     properties:
       docker_ee_url: { get_param: docker_ee_url }
       docker_ee_release: { get_param: docker_ee_release }
+      docker_ee_packages: { get_param: docker_ee_packages }
       docker_ucp_image: { get_param: docker_ucp_image}
       docker_default_address_pool: { get_param: docker_default_address_pool }
       key_name: { get_attr: [keypair_name, value] }
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 5d2cb9b..ed1f988 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -44,6 +44,7 @@
 NODE_METADATA=${NODE_METADATA:-'$node_metadata'}
 DOCKER_EE_URL=${DOCKER_EE_URL:-$docker_ee_url}
 DOCKER_EE_RELEASE=${DOCKER_EE_RELEASE:-$docker_ee_release}
+DOCKER_EE_PACKAGES=${DOCKER_EE_PACKAGES:-$docker_ee_packages}
 DOCKER_UCP_IMAGE=${DOCKER_UCP_IMAGE:-$docker_ucp_image}
 BINARY_BASE_URL=${BINARY_BASE_URL:-$binary_base_url}
 UCP_DOCKER_SWARM_DATA_PORT=${UCP_DOCKER_SWARM_DATA_PORT:-$docker_ucp_swarm_data_port}
@@ -67,14 +68,7 @@
 # to the fact that actual netmask for docker_gwbridge is given from it
 DOCKER_DEFAULT_ADDRESS_SIZE=${DOCKER_DEFAULT_ADDRESS_SIZE:-24}
 DOCKER_EE_RELEASE=${DOCKER_EE_RELEASE:-stable-19.03}
-DOCKER_EE_PACKAGES='docker-ee'
-DOCKER_RELEASE='stable'
-DOCKER_PACKAGES='docker-ce'
-if [ -n "${DOCKER_EE_URL}" ]; then
-    DOCKER_URL="${DOCKER_EE_URL}"
-    DOCKER_RELEASE="${DOCKER_EE_RELEASE}"
-    DOCKER_PACKAGES="${DOCKER_EE_PACKAGES}"
-fi
+DOCKER_EE_PACKAGES=${DOCKER_EE_PACKAGES:-'docker-ee'}
 BINARY_BASE_URL=${BINARY_BASE_URL:-"http://binary.mirantis.com"}
 
 ### COMMON FUNCTIONS ###
@@ -293,9 +287,9 @@
 
 function install_docker {
     function install_retry {
-        curl --retry 6 --retry-delay 5 -fsSL "${DOCKER_URL}/gpg" | sudo apt-key add -
-        add-apt-repository "deb [arch=amd64] ${DOCKER_URL}/ ${OS_CODENAME} ${DOCKER_RELEASE}"
-        install_pkgs ${DOCKER_PACKAGES}
+        curl --retry 6 --retry-delay 5 -fsSL "${DOCKER_EE_URL}/gpg" | sudo apt-key add -
+        add-apt-repository "deb [arch=amd64] ${DOCKER_EE_URL}/ ${OS_CODENAME} ${DOCKER_EE_RELEASE}"
+        install_pkgs ${DOCKER_EE_PACKAGES}
     }
     retry 10 "Failed to install docker" install_retry
 }
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index d7be4a7..dfbb370 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -317,6 +317,9 @@
   docker_ee_release:
     type: string
     default: 'stable-19.03'
+  docker_ee_packages:
+    type: string
+    default: "docker-ee"
   docker_ucp_image:
     type: string
     default: 'docker/ucp:3.2.4'
@@ -535,6 +538,7 @@
       metadata: { get_param: ucp_metadata}
       docker_ee_url: { get_param: docker_ee_url }
       docker_ee_release: { get_param: docker_ee_release }
+      docker_ee_packages: { get_param: docker_ee_packages }
       docker_ucp_image: { get_param: docker_ucp_image}
       docker_ucp_swarm_data_port: { get_param: docker_ucp_swarm_data_port }
       docker_default_address_pool: { get_param: docker_default_address_pool }
@@ -576,6 +580,7 @@
           flavor: { get_param: masters_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -610,6 +615,7 @@
           flavor: { get_param: workers_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -662,6 +668,7 @@
           flavor: { get_param: cmps_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -714,6 +721,7 @@
           flavor: { get_param: acmps_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -767,6 +775,7 @@
           flavor: { get_param: gtws_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -810,6 +819,7 @@
           flavor: { get_param: lmas_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -853,6 +863,7 @@
           flavor: { get_param: osds_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -904,6 +915,7 @@
           flavor: { get_param: frrs_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -954,6 +966,7 @@
           flavor: { get_param: ntws_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -1004,6 +1017,7 @@
           flavor: { get_param: vbmcs_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }
@@ -1047,6 +1061,7 @@
           flavor: { get_param: tsrvs_flavor }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
+          docker_ee_packages: { get_param: docker_ee_packages }
           docker_ucp_image: { get_param: docker_ucp_image}
           docker_default_address_pool: { get_param: docker_default_address_pool }
           binary_base_url: { get_param: binary_base_url }