diff --git a/roles/example/meta/argument_specs.yml b/roles/example/meta/argument_specs.yaml
similarity index 100%
rename from roles/example/meta/argument_specs.yml
rename to roles/example/meta/argument_specs.yaml
diff --git a/roles/example/tasks/main.yml b/roles/example/tasks/main.yaml
similarity index 100%
rename from roles/example/tasks/main.yml
rename to roles/example/tasks/main.yaml
diff --git a/roles/grafana/meta/argument_specs.yml b/roles/grafana/meta/argument_specs.yaml
similarity index 100%
rename from roles/grafana/meta/argument_specs.yml
rename to roles/grafana/meta/argument_specs.yaml
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yaml
similarity index 97%
rename from roles/grafana/tasks/main.yml
rename to roles/grafana/tasks/main.yaml
index 0adba87..303baff 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yaml
@@ -17,7 +17,7 @@
     service_container_additional_networks: "{{ grafana_additional_networks }}"
     service_container_env:
       GF_DATABASE_TYPE: postgres
-      GF_DATABASE_HOST: grafana-postgres:5432
+      GF_DATABASE_HOST: postgres:5432
       GF_DATABASE_NAME: grafana
       GF_DATABASE_USER: grafana
       GF_DATABASE_PASSWORD__FILE: /run/secrets/postgres
diff --git a/roles/prometheus/meta/argument_specs.yml b/roles/prometheus/meta/argument_specs.yaml
similarity index 100%
rename from roles/prometheus/meta/argument_specs.yml
rename to roles/prometheus/meta/argument_specs.yaml
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yaml
similarity index 100%
rename from roles/prometheus/tasks/main.yml
rename to roles/prometheus/tasks/main.yaml