diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
index 08f8a370143..5b368b7df17 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
@@ -277,7 +277,11 @@ private void runAnsibleHostDeployPlaybook() {
             }
             Cluster hostCluster = clusterDao.get(getClusterId());
             boolean isGlusterServiceSupported = hostCluster.supportsGlusterService();
-            String tunedProfile = isGlusterServiceSupported ? hostCluster.getGlusterTunedProfile() : null;
+            String tunedProfile = "virtual-host";
+            if (hostCluster.supportsGlusterService() && StringUtils.isNotBlank(hostCluster.getGlusterTunedProfile())) {
+                // custom tuned profile is specified for gluster cluster
+                tunedProfile = hostCluster.getGlusterTunedProfile();
+            }
             String clusterVersion = hostCluster.getCompatibilityVersion().getValue();
             AnsibleCommandConfig commandConfig = new AnsibleCommandConfig()
                     .hosts(vds)
diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml
index d430e590380..9d5df3ad2af 100644
--- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml
+++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml
@@ -1,10 +1,4 @@
 ---
-- name: Set profile
-  set_fact:
-    profile: >
-      "{{ 'virtual-host' if (host_deploy_tuned_profile is none and host_deploy_virt_enabled|bool)
-      else host_deploy_tuned_profile }}"
-
 - name: Get lastest tune package
   yum:
     name: tuned
@@ -16,7 +10,7 @@
     state: started
 
 - name: Set tune profile
-  shell: "tuned-adm profile {{ profile }}"
+  shell: "tuned-adm profile {{ host_deploy_tuned_profile }}"
   register: tune_profile_set
   tags:
     - skip_ansible_lint # E305