diff --git a/bundles/grafana/metadata.py b/bundles/grafana/metadata.py
index 12f95ce..4ac5259 100644
--- a/bundles/grafana/metadata.py
+++ b/bundles/grafana/metadata.py
@@ -26,9 +26,15 @@ defaults = {
         'config': {
             'server': {
                 'http_port': 8300,
+                'http_addr': '127.0.0.1',
+                'enable_gzip': True,
             },
             'database': {
-                'url': f'postgres://grafana:{postgres_password}@localhost:5432/grafana',
+                'type': 'postgres',
+                'host': '127.0.0.1:5432',
+                'name': 'grafana',
+                'user': 'grafana',
+                'password': postgres_password,
             },
             'remote_cache': {
                 'type': 'redis',
diff --git a/bundles/redis/items.py b/bundles/redis/items.py
index c077b46..91e5821 100644
--- a/bundles/redis/items.py
+++ b/bundles/redis/items.py
@@ -1,6 +1,7 @@
 directories = {
     '/etc/redis': {
         'purge': True,
+        'owner': 'redis',
         'needs': [
             'pkg_apt:redis-server',
         ],
@@ -45,7 +46,7 @@ for name, conf in node.metadata.get('redis').items():
             f'svc_systemd:redis-{name}:restart'
         ],
     }
-    
+
     svc_systemd[f'redis-{name}'] = {
         'needs': [
             'svc_systemd:redis',