diff --git a/amazon-arm.json b/amazon-arm.json
index 7b077ca63..cbcfed27d 100644
--- a/amazon-arm.json
+++ b/amazon-arm.json
@@ -5,7 +5,7 @@
     "region": "ap-northeast-1",
     "ami_regions": "eu-central-1,eu-west-1,eu-west-2,ap-south-1,ap-southeast-1,ap-southeast-2,us-west-1,us-east-1,ca-central-1,sa-east-1,ap-northeast-1",
     "ami": "ami-0d24b4f369844fc54",
-    "ami_name": "supabase-postgres-0.16.0",
+    "ami_name": "supabase-postgres-0.16.1",
     "environment": "prod",
     "ansible_arguments": "--skip-tags,update-only -v"
   },
diff --git a/amazon.json b/amazon.json
index 8df5bcd3e..ddb16b3ab 100644
--- a/amazon.json
+++ b/amazon.json
@@ -5,7 +5,7 @@
     "region": "af-south-1",
     "ami_regions": "af-south-1",
     "ami": "ami-07d30d5bf2d29a582",
-    "ami_name": "supabase-postgres-0.16.0",
+    "ami_name": "supabase-postgres-0.16.1",
     "environment": "prod",
     "ansible_arguments": "--skip-tags,update-only"
   },
diff --git a/ansible/files/postgres_exporter.service.j2 b/ansible/files/postgres_exporter.service.j2
index cbf56d3c9..906e4566d 100644
--- a/ansible/files/postgres_exporter.service.j2
+++ b/ansible/files/postgres_exporter.service.j2
@@ -9,7 +9,8 @@ StandardOutput=file:/var/log/postgres_exporter.stdout
 StandardError=file:/var/log/postgres_exporter.error
 Restart=always
 RestartSec=3
-Environment="DATA_SOURCE_URI=localhost/postgres"
+Environment="DATA_SOURCE_URI=localhost/postgres?sslmode=disable"
+Environment="DATA_SOURCE_USER=supabase_admin"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ansible/files/queries.yml.j2 b/ansible/files/queries.yml.j2
index 7f1098b5c..ef80abd77 100644
--- a/ansible/files/queries.yml.j2
+++ b/ansible/files/queries.yml.j2
@@ -16,7 +16,7 @@ pg_stat_database:
         description: "The number of active backends"
 
 pg_stat_statements:
-  query: "SELECT sum(calls) as total_queries, sum(total_time / 1000) as total_time_seconds FROM pg_stat_statements t1 JOIN pg_database t3 ON (t1.dbid=t3.oid)"
+  query: "SELECT sum(calls) as total_queries, sum(total_time / 1000) as total_time_seconds FROM extensions.pg_stat_statements t1 JOIN pg_database t3 ON (t1.dbid=t3.oid)"
   master: true
   metrics:
     - total_queries:
diff --git a/ansible/files/stat_extension.sql b/ansible/files/stat_extension.sql
index 841ff0c4b..38dd87b45 100644
--- a/ansible/files/stat_extension.sql
+++ b/ansible/files/stat_extension.sql
@@ -1 +1 @@
-CREATE EXTENSION IF NOT EXISTS pg_stat_statements;
+CREATE EXTENSION IF NOT EXISTS pg_stat_statements with schema extensions;
diff --git a/digitalOcean.json b/digitalOcean.json
index b1f66e73d..ad9cc8e6b 100644
--- a/digitalOcean.json
+++ b/digitalOcean.json
@@ -4,7 +4,7 @@
     "image_name": "ubuntu-18-04-x64",
     "region": "sgp1",
     "snapshot_regions": "sgp1",
-    "snapshot_name": "supabase-postgres-0.16.0",
+    "snapshot_name": "supabase-postgres-0.16.1",
     "ansible_arguments": "--skip-tags,update-only,--skip-tags,aws-only"
   },
   "builders": [