diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 161eacf580..7e1bcecc27 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -5,6 +5,7 @@ resource_registry:
   OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
 
 parameter_defaults:
+  EnablePackageInstall: true
   StackAction: CREATE
   SoftwareConfigTransport: POLL_SERVER_HEAT
   NeutronTunnelTypes: []
diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml
index dc352557aa..85f35a2b33 100644
--- a/roles/Undercloud.yaml
+++ b/roles/Undercloud.yaml
@@ -12,6 +12,7 @@
     - controller
   ServicesDefault:
     - OS::TripleO::Services::Apache
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::GlanceApi
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn
diff --git a/roles/UndercloudLight.yaml b/roles/UndercloudLight.yaml
index bc1b1c9af7..c365efef8a 100644
--- a/roles/UndercloudLight.yaml
+++ b/roles/UndercloudLight.yaml
@@ -14,6 +14,7 @@
     - controller
   ServicesDefault:
     - OS::TripleO::Services::ContainersLogrotateCrond
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn
     - OS::TripleO::Services::HeatEngine
diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml
index 074cbbb746..6903b5a5b8 100644
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@@ -15,6 +15,7 @@
     - controller
   ServicesDefault:
     - OS::TripleO::Services::Apache
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::GlanceApi
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn