diff --git a/pipelines/vars/forklift_luna.yml b/pipelines/vars/forklift_luna.yml
index c95201690..5dc89b4d4 100644
--- a/pipelines/vars/forklift_luna.yml
+++ b/pipelines/vars/forklift_luna.yml
@@ -28,9 +28,9 @@ server_box:
 
         - "--enable-foreman-plugin-bootdisk"
 
-        - "{{ '--enable-foreman-cli-discovery' if ('9' not in pipeline_os) else '' }}"
-        - "{{ '--enable-foreman-plugin-discovery' if ('9' not in pipeline_os) else '' }}"
-        - "{{ '--enable-foreman-proxy-plugin-discovery' if ('9' not in pipeline_os) else '' }}"
+        - "--enable-foreman-cli-discovery"
+        - "--enable-foreman-plugin-discovery"
+        - "--enable-foreman-proxy-plugin-discovery"
 
         - "--enable-foreman-cli-google"
         - "--enable-foreman-plugin-google"
@@ -81,7 +81,7 @@ proxy_box:
         - foreman-installer-katello
       foreman_installer_options:
         - "--enable-foreman-proxy-plugin-ansible"
-        - "{{ '--enable-foreman-proxy-plugin-discovery' if ('9' not in pipeline_os) else '' }}"
+        - "--enable-foreman-proxy-plugin-discovery"
         - "--enable-foreman-proxy-plugin-openscap"
         - "--enable-foreman-proxy-plugin-remote-execution-script"
         - "--foreman-proxy-content-enable-ostree true"
diff --git a/pipelines/vars/forklift_plugins.yml b/pipelines/vars/forklift_plugins.yml
index d35f7a6a6..ff5edb136 100644
--- a/pipelines/vars/forklift_plugins.yml
+++ b/pipelines/vars/forklift_plugins.yml
@@ -24,9 +24,9 @@ server_box:
 
         - "--enable-foreman-plugin-bootdisk"
 
-        - "{{ '--enable-foreman-cli-discovery' if ('9' not in pipeline_os) else '' }}"
-        - "{{ '--enable-foreman-plugin-discovery' if ('9' not in pipeline_os) else '' }}"
-        - "{{ '--enable-foreman-proxy-plugin-discovery' if ('9' not in pipeline_os) else '' }}"
+        - "--enable-foreman-cli-discovery"
+        - "--enable-foreman-plugin-discovery"
+        - "--enable-foreman-proxy-plugin-discovery"
 
         - "--enable-foreman-cli-google"
         - "--enable-foreman-plugin-google"