diff --git a/influxdb/client/database/ceilometer.yml b/influxdb/client/database/ceilometer.yml
index 52aebae..88d6a07 100644
--- a/influxdb/client/database/ceilometer.yml
+++ b/influxdb/client/database/ceilometer.yml
@@ -8,7 +8,7 @@
           enabled: true
           name: ceilometer
           retention_policy:
-            - name: ceilometer_default
+            - name: ceilometer
               is_default: true
               duration: ${_param:influxdb_ceilometer_rp_duration}
               replication: 1
diff --git a/influxdb/client/database/prometheus.yml b/influxdb/client/database/prometheus.yml
new file mode 100644
index 0000000..991fbd2
--- /dev/null
+++ b/influxdb/client/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+  _param:
+    influxdb_prometheus_rp_duration: 30d
+  influxdb:
+    client:
+      database:
+        prometheus:
+          enabled: true
+          name: prometheus
+          retention_policy:
+          - name: lma
+            is_default: true
+            duration: ${_param:influxdb_prometheus_rp_duration}
+            replication: 1
+      user:
+        lma:
+          enabled: true
+          name: lma
+          password: ${_param:influxdb_stacklight_password}
+      grant:
+        lma_all_on_prometheus:
+          enabled: true
+          user: lma
+          database: prometheus
+          privilege: all
diff --git a/influxdb/client/database/stacklight.yml b/influxdb/client/database/stacklight.yml
index d07d0b8..76b8e60 100644
--- a/influxdb/client/database/stacklight.yml
+++ b/influxdb/client/database/stacklight.yml
@@ -8,9 +8,9 @@
           enabled: true
           name: lma
           retention_policy:
-          - name: lma_default
+          - name: lma
             is_default: true
-            duration: ${_param:influxdb_stacklight_password}
+            duration: ${_param:influxdb_stacklight_rp_duration}
             replication: 1
       user:
         lma:
@@ -18,7 +18,7 @@
           name: lma
           password: ${_param:influxdb_stacklight_password}
       grant:
-        lma_all:
+        lma_all_on_lma:
           enabled: true
           user: lma
           database: lma
diff --git a/influxdb/database/prometheus.yml b/influxdb/database/prometheus.yml
new file mode 100644
index 0000000..3e3d63b
--- /dev/null
+++ b/influxdb/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+  _param:
+    influxdb_prometheus_database_retention: 30d
+  influxdb:
+    server:
+      database:
+        prometheus:
+          enabled: true
+          name: prometheus
+          retention_policy:
+          - name: lma
+            is_default: true
+            duration: ${_param:influxdb_prometheus_database_retention}
+            replication: 1
+      user:
+        lma:
+          enabled: true
+          name: lma
+          password: ${_param:influxdb_stacklight_password}
+      grant:
+        grant_lma_all_on_prometheus:
+          enabled: true
+          user: lma
+          database: prometheus
+          privilege: all
diff --git a/influxdb/database/stacklight.yml b/influxdb/database/stacklight.yml
index d741380..9eb2eb0 100644
--- a/influxdb/database/stacklight.yml
+++ b/influxdb/database/stacklight.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    influxdb_lma_database_retention: 30d
   influxdb:
     server:
       database:
@@ -8,7 +10,7 @@
           retention_policy:
           - name: lma
             is_default: true
-            duration: 30d
+            duration: ${_param:influxdb_lma_database_retention}
             replication: 1
       user:
         lma:
@@ -16,7 +18,7 @@
           name: lma
           password: ${_param:influxdb_stacklight_password}
       grant:
-        grant_lma_all:
+        grant_lma_all_on_lma:
           enabled: true
           user: lma
           database: lma