diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 88632db725..4cef1db833 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -6,7 +6,10 @@ ansible_python_interpreter: /usr/bin/python3
 {% endif %}
 
 kolla_base_distro: "{{ base_distro }}"
+# Zed dropped install_type so we have it only on upgrades
+{% if is_upgrade %}
 kolla_install_type: "{{ install_type }}"
+{% endif %}
 network_interface: "{{ api_interface_name }}"
 network_address_family: "{{ address_family }}"
 docker_restart_policy: "no"
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index e7ebe12f3b..346bc8af1f 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -75,7 +75,6 @@
       - ^tests/test-bifrost.sh
     vars:
       scenario: bifrost
-      install_type: source
 
 - job:
     name: kolla-ansible-ironic-base
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 88248fc331..7044a49bd9 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -5,7 +5,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
       tls_enabled: true
 
 - job:
@@ -23,7 +22,6 @@
     nodeset: kolla-ansible-debian-bullseye
     vars:
       base_distro: debian
-      install_type: source
       tls_enabled: true
 
 - job:
@@ -33,7 +31,6 @@
     voting: false
     vars:
       base_distro: centos
-      install_type: source
       tls_enabled: true
 
 - job:
@@ -43,7 +40,6 @@
     voting: false
     vars:
       base_distro: centos
-      install_type: source
       tls_enabled: true
 
 - job:
@@ -52,7 +48,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
       tls_enabled: true
 
 - job:
@@ -61,7 +56,6 @@
     nodeset: kolla-ansible-centos8s-nested-virt
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-kvm
@@ -69,7 +63,6 @@
     nodeset: kolla-ansible-focal-nested-virt
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-multinode-ipv6
@@ -77,7 +70,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-multinode-ipv6
@@ -85,7 +77,6 @@
     nodeset: kolla-ansible-focal-multi
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-cephadm
@@ -94,7 +85,6 @@
     timeout: 9000
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-cephadm
@@ -103,7 +93,6 @@
     timeout: 9000
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-mariadb
@@ -111,7 +100,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-mariadb
@@ -119,7 +107,6 @@
     nodeset: kolla-ansible-focal-multi
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-upgrade
@@ -199,7 +186,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-debian-source-zun
@@ -207,7 +193,6 @@
     nodeset: kolla-ansible-debian-bullseye-multi
     vars:
       base_distro: debian
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-zun
@@ -215,7 +200,6 @@
     nodeset: kolla-ansible-focal-multi
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-swift
@@ -223,7 +207,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-swift
@@ -231,7 +214,6 @@
     nodeset: kolla-ansible-focal-multi
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-swift-upgrade
@@ -259,7 +241,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-ironic
@@ -267,7 +248,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-debian-source-ironic
@@ -275,7 +255,6 @@
     nodeset: kolla-ansible-debian-bullseye
     vars:
       base_distro: debian
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-ironic
@@ -283,7 +262,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-magnum
@@ -291,7 +269,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-magnum
@@ -299,7 +276,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-octavia
@@ -307,7 +283,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-octavia
@@ -315,7 +290,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-masakari
@@ -323,7 +297,6 @@
     nodeset: kolla-ansible-focal-masakari
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-masakari
@@ -331,7 +304,6 @@
     nodeset: kolla-ansible-centos8s-masakari
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-monasca
@@ -339,7 +311,6 @@
     nodeset: kolla-ansible-centos8s-multi-monasca
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-cells
@@ -347,7 +318,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-linuxbridge
@@ -355,7 +325,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-linuxbridge
@@ -363,7 +332,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-ovn
@@ -371,7 +339,6 @@
     nodeset: kolla-ansible-centos8s-multi
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-ovn
@@ -379,7 +346,6 @@
     nodeset: kolla-ansible-focal-multi
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-prometheus-efk
@@ -387,7 +353,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-prometheus-efk
@@ -395,7 +360,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-source-venus
@@ -403,7 +367,6 @@
     nodeset: kolla-ansible-centos8s
     vars:
       base_distro: centos
-      install_type: source
 
 - job:
     name: kolla-ansible-ubuntu-source-venus
@@ -411,7 +374,6 @@
     nodeset: kolla-ansible-focal
     vars:
       base_distro: ubuntu
-      install_type: source
 
 - job:
     name: kolla-ansible-centos8s-hashi-vault