diff --git a/playbooks/pik8s.yml b/playbooks/pik8s.yml
index 0d3fac0..84c8da3 100755
--- a/playbooks/pik8s.yml
+++ b/playbooks/pik8s.yml
@@ -3,6 +3,7 @@
 ---
 # k8s
 - hosts: pik8s
+  gather_facts: no
   roles:
     - role: k8s
       tags: [ k8s, skip-pull ]
@@ -13,6 +14,7 @@
           - kubelet
       tags: [ k8s, motd ]
 - hosts: pik8s_masters
+  gather_facts: no
   tasks:
     - name: install openshift
       pip: name=openshift state=latest
diff --git a/playbooks/pimp.yml b/playbooks/pimp.yml
index d7a7b92..82f19ec 100755
--- a/playbooks/pimp.yml
+++ b/playbooks/pimp.yml
@@ -32,6 +32,12 @@
           - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 }
             # Used for internal access from other nodes
           - { type: host, database: all, user: all, address: '192.168.0.0/16', auth_method: md5 }
+        postgresql_users:
+          - name: grafana
+            password: "{{ secret_grafana_local_db_pass }}"
+        postgresql_databases:
+          - name: grafana
+            owner: grafana
       tags: [ pis, storage, psql ]
     - role: nfs
       vars: