diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp
index 3fa75b92d..6d7bae3d2 100644
--- a/manifests/profile/base/docker_registry.pp
+++ b/manifests/profile/base/docker_registry.pp
@@ -19,7 +19,7 @@
 # === Parameters:
 # [*enable_container_images_build*]
 #  (Optional) Whether to install tools to build docker container images
-#  Defaults to hiera('enable_container_images_build', true)
+#  Defaults to hiera('enable_container_images_build', false)
 #
 # [*registry_host*]
 #  (String) IP address or hostname the Docker registry binds to
@@ -36,7 +36,7 @@
 #
 #
 class tripleo::profile::base::docker_registry (
-  $enable_container_images_build = hiera('enable_container_images_build', true),
+  $enable_container_images_build = hiera('enable_container_images_build', false),
   # these are used within the config.yaml below
   $registry_host                 = hiera('controller_host'),
   $registry_port                 = 8787,
diff --git a/releasenotes/notes/nokolla-7898fe76cf623a0c.yaml b/releasenotes/notes/nokolla-7898fe76cf623a0c.yaml
new file mode 100644
index 000000000..d5f0c5838
--- /dev/null
+++ b/releasenotes/notes/nokolla-7898fe76cf623a0c.yaml
@@ -0,0 +1,9 @@
+---
+other:
+  - |
+
+    The default for
+    tripleo::profile::base::docker_registry::enable_container_images_build is
+    now false by default, so any users relying on this to install
+    openstack-kolla will need to explicitly set this to true in their local
+    hieradata.