diff --git a/roles/upgrade-host/defaults/main.yml b/roles/upgrade-host/defaults/main.yml
new file mode 100644
index 000000000..7b85455be
--- /dev/null
+++ b/roles/upgrade-host/defaults/main.yml
@@ -0,0 +1,15 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ubuntu_kernel_hwe: false
diff --git a/roles/upgrade-host/tasks/main.yaml b/roles/upgrade-host/tasks/main.yaml
index 24ecd99f6..e5a54dcc6 100644
--- a/roles/upgrade-host/tasks/main.yaml
+++ b/roles/upgrade-host/tasks/main.yaml
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 - name: Upgrade to HWE kernel on Ubuntu Hosts
-  when: ansible_distribution == 'Ubuntu'
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ubuntu_kernel_hwe == true
   block:
     - name: Deploy HWE kernel on Ubuntu Hosts
       include_role: