diff --git a/kolla/common/config.py b/kolla/common/config.py
index 54fd6ba2df..cb67456f2e 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -1038,7 +1038,7 @@ def parse(conf, args, usage=None, prog=None,
     # NOTE(jeffrey4l): set the default base tag based on the
     # base option
     conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag'])
-    prefix = '' if conf.openstack_release == 'master' else 'stable-'
+    prefix = '' if conf.openstack_release == 'master' else 'unmaintained-'
     openstack_branch = '{}{}'.format(prefix, conf.openstack_release)
     openstack_branch_slashed = openstack_branch.replace('-', '/')
     conf.set_default('openstack_branch', openstack_branch)
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 2edc64f002..8a8e2d0b02 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -99,7 +99,6 @@ UNBUILDABLE_IMAGES = {
     },
 
     'source': {
-        "bifrost-base",          # Broken on unmaintained/yoga
     },
 
     'centos': {