diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 8acf689656..3381fb5a03 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -1,22 +1,21 @@
 ---
 kolla_base_distro: "{{ base_distro }}"
 kolla_install_type: "{{ install_type }}"
+network_interface: "{{ api_interface_name }}"
+docker_restart_policy: "never"
 
 # Use a random router id, otherwise it may result in the same router id
 # in the CI gate.
 keepalived_virtual_router_id: "{{ 250 | random(1) }}"
 
-{% if scenario != "bifrost" %}
-{% if hostvars|length > 2 %}
-kolla_internal_vip_address: "{{ api_interface_address }}"
-enable_haproxy: "no"
-{% else %}
-kolla_internal_vip_address: "169.254.169.10"
-{% endif %}
+{% if enable_core_openstack | bool %}
+kolla_internal_vip_address: "{{ api_interface_address if hostvars | length > 2 else '169.254.169.10' }}"
+enable_haproxy: "{{ 'no' if hostvars | length > 2 else 'yes' }}"
+neutron_external_interface: "fake_interface"
+openstack_logging_debug: "True"
+openstack_service_workers: "1"
 {% endif %}
 
-network_interface: "{{ api_interface_name }}"
-docker_restart_policy: "never"
 {% if need_build_image %}
 # NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying
 docker_namespace: "lokolla"
@@ -26,22 +25,15 @@ docker_registry: "{{ api_interface_address }}:4000"
 docker_namespace: "kolla"
 openstack_release: "{{ zuul.branch | basename }}"
 {% endif %}
-{% if scenario != "bifrost" %}
-neutron_external_interface: "fake_interface"
-enable_horizon: "yes"
-enable_heat: "no"
-openstack_logging_debug: "True"
-openstack_service_workers: "1"
-{% endif %}
-
-# This is experimental feature, disable if gate fail.
-glance_enable_rolling_upgrade: "yes"
 
 {% if scenario == "ceph" %}
 enable_ceph: "yes"
 enable_cinder: "yes"
 ceph_pool_pg_num: 8
 ceph_pool_pgp_num: 8
+# This is experimental feature, disable if gate fail.
+# In multinode jobs without ceph rolling upgrade fails.
+glance_enable_rolling_upgrade: "yes"
 {% endif %}
 
 {% if scenario == "zun" %}
@@ -49,5 +41,3 @@ enable_zun: "yes"
 enable_kuryr: "yes"
 docker_custom_option: " -H unix:///var/run/docker.sock -H tcp://{{ api_interface_address }}:2375"
 {% endif %}
-
-keystone_token_provider: "fernet"
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index bf3ce61fe6..455212e977 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -35,7 +35,7 @@ EOF
     rm ${PIP_CONF}
 
     if [[ $ACTION != "bifrost" ]]; then
-        GATE_IMAGES="cron,fluentd,glance,haproxy,keepalived,keystone,kolla-toolbox,mariadb,memcached,neutron,nova,openvswitch,rabbitmq,horizon,chrony"
+        GATE_IMAGES="cron,fluentd,glance,haproxy,keepalived,keystone,kolla-toolbox,mariadb,memcached,neutron,nova,openvswitch,rabbitmq,horizon,chrony,heat"
     else
         GATE_IMAGES="bifrost"
     fi
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 9c1d0ecb5a..68aace68ee 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -16,6 +16,7 @@
       - ^releasenotes/.*$
     vars:
       scenario: aio
+      enable_core_openstack: yes
     roles:
       - zuul: openstack-infra/zuul-jobs
 
@@ -25,3 +26,4 @@
     vars:
       scenario: bifrost
       install_type: source
+      enable_core_openstack: no