diff --git a/tripleo_ansible/roles/login-defs/tasks/main.yml b/tripleo_ansible/roles/login-defs/tasks/main.yml
index 349dedbee..20ae025a8 100644
--- a/tripleo_ansible/roles/login-defs/tasks/main.yml
+++ b/tripleo_ansible/roles/login-defs/tasks/main.yml
@@ -17,21 +17,6 @@
 
 # "login-defs" will search for and load any operating system variable file
 
-# found within the "vars/" path. If no OS files are found the task will skip.
-- name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - skip: true
-      files:
-        - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-        - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-        - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-        - "{{ ansible_distribution | lower }}.yml"
-        - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-        - "{{ ansible_os_family | lower }}.yml"
-  tags:
-    - always
-
 - name: Install shadow-utils
   package:
     name: shadow-utils
diff --git a/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml b/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml
index 3c71fcfa5..c5a54d2e7 100644
--- a/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml
@@ -17,21 +17,6 @@
 
 # "tripleo-ceph-common" will search for and load any operating system variable file
 
-# found within the "vars/" path. If no OS files are found the task will skip.
-- name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - skip: true
-      files:
-        - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-        - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-        - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-        - "{{ ansible_distribution | lower }}.yml"
-        - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-        - "{{ ansible_os_family | lower }}.yml"
-  tags:
-    - always
-
 - name: set basic user fact
   set_fact:
     ansible_user: "{{ lookup('env', 'USER') }}"