diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index b4ef05a7a84e2f39341d9d828928133039c8b335..8ec048c2dfd59368d19d7999d275b759f419a603 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -50,7 +50,7 @@ kolla_dev_repos_directory: "/opt/stack/"
 kolla_dev_repos_git: "https://opendev.org/openstack"
 kolla_dev_repos_pull: "no"
 kolla_dev_mode: "no"
-kolla_source_version: "master"
+kolla_source_version: "{{ openstack_release }}"
 
 # Proxy settings for containers such as magnum that need internet access
 container_http_proxy: ""
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index e79c03cce4c09c3225c307a0bf15991a6223f53b..7bc372de815e7d53d4add0a28205cf626fe8ee85 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -17,8 +17,8 @@
 # Valid options are [ binary, source ]
 #kolla_install_type: "binary"
 
-# Valid option is Docker repository tag
-#openstack_release: ""
+# Do not override this unless you know what you are doing.
+#openstack_release: "master"
 
 # Docker image tag used by default.
 #openstack_tag: "{{ openstack_release ~ openstack_tag_suffix }}"