diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index b27ea13..b018e67 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -3,10 +3,10 @@
 # At the end of system configuration, we should have a complete
 # Edubuntu system
 
-- include: ansible-pull.yml
-  tags:
-    - base
-    - ansible-pull
+#- include: ansible-pull.yml
+#  tags:
+#    - base
+#    - ansible-pull
 
 - include: apt-sources.yml
   tags:
diff --git a/roles/prereq/tasks/prereq.yml b/roles/prereq/tasks/prereq.yml
index 9c59424..5b025bb 100644
--- a/roles/prereq/tasks/prereq.yml
+++ b/roles/prereq/tasks/prereq.yml
@@ -28,6 +28,9 @@
     group: root
     mode: 0755
 
+- name: Loading domain variables
+  setup: filter=ansible_local
+
 - name: Creating facts.d script for repo/pkg versions
   template:
     src: checksum.fact
@@ -36,6 +39,5 @@
     owner: root
     group: root
 
-- name: Loading domain variables
-  setup:
-    filter: ansible_local
+- name: Loading repo/pkg versions
+  setup: filter=ansible_local