diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml
index e1e25d66e..bbdf4ae44 100644
--- a/tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml
@@ -21,6 +21,7 @@
 tripleo_puppet_cache_base_dir: /var/lib/container-puppet/puppetlabs
 tripleo_puppet_cache_config: |
     facts : {
+        blocklist: [ "EC2" ],
         ttls: [
           { "kernel" : 8 hour },
           { "memory" : 8 hour },
diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml
index 49b453d0b..ff0d2637c 100644
--- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml
+++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml
@@ -19,7 +19,7 @@
   hosts: all
   vars:
     required_packages:
-      - puppet
+      - facter
       - rsync
   roles:
     - role: test_deps
diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml
index 435edb4fb..ebf086dd1 100644
--- a/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml
@@ -80,13 +80,15 @@
   become: true
   check_mode: false
   shell: facter --config "{{ tripleo_puppet_cache_base_dir }}/facter.conf"
+  retries: 5
+  delay: 5
   no_log: true
   failed_when: false
   register: _facter_cache_run
 
-- name: Facter error output when failed
+- name: Failed deployment if facter fails
   check_mode: false
-  debug:
+  fail:
     msg: "{{ _facter_cache_run.stderr }}"
   when: _facter_cache_run.rc != 0