diff --git a/java/google/registry/reporting/ActivityReportingQueryBuilder.java b/java/google/registry/reporting/ActivityReportingQueryBuilder.java
index 0f5380954..159a25cb3 100644
--- a/java/google/registry/reporting/ActivityReportingQueryBuilder.java
+++ b/java/google/registry/reporting/ActivityReportingQueryBuilder.java
@@ -76,8 +76,8 @@ public final class ActivityReportingQueryBuilder implements QueryBuilder {
     String operationalRegistrarsQuery =
         SqlTemplate.create(getQueryFromFile("registrar_operating_status.sql"))
             .put("PROJECT_ID", projectId)
-            .put("REGISTRAR_DATA_SET", "registrar_data")
-            .put("REGISTRAR_STATUS_TABLE", "registrar_status")
+            .put("DATASTORE_EXPORT_DATA_SET", DATASTORE_EXPORT_DATA_SET)
+            .put("REGISTRAR_TABLE", "Registrar")
             .build();
     queriesBuilder.put(getTableName(REGISTRAR_OPERATING_STATUS), operationalRegistrarsQuery);
 
diff --git a/java/google/registry/reporting/IcannReportingModule.java b/java/google/registry/reporting/IcannReportingModule.java
index 23129ee2d..d09e3c207 100644
--- a/java/google/registry/reporting/IcannReportingModule.java
+++ b/java/google/registry/reporting/IcannReportingModule.java
@@ -47,7 +47,6 @@ public final class IcannReportingModule {
   static final String ICANN_REPORTING_DATA_SET = "icann_reporting";
   static final String DATASTORE_EXPORT_DATA_SET = "latest_datastore_export";
   private static final String BIGQUERY_SCOPE =  "https://www.googleapis.com/auth/bigquery";
-  private static final String DRIVE_SCOPE = "https://www.googleapis.com/auth/drive.readonly";
 
   @Provides
   @Parameter(PARAM_YEAR_MONTH)
@@ -90,7 +89,7 @@ public final class IcannReportingModule {
           .getApplicationDefault(transport, new JacksonFactory());
       BigqueryConnection connection = new BigqueryConnection.Builder()
           .setExecutorService(Executors.newFixedThreadPool(20))
-          .setCredential(credential.createScoped(ImmutableList.of(BIGQUERY_SCOPE, DRIVE_SCOPE)))
+          .setCredential(credential.createScoped(ImmutableList.of(BIGQUERY_SCOPE)))
           .setDatasetId(ICANN_REPORTING_DATA_SET)
           .setOverwrite(true)
           .setPollInterval(Duration.standardSeconds(1))
diff --git a/java/google/registry/reporting/sql/activity_report_aggregation.sql b/java/google/registry/reporting/sql/activity_report_aggregation.sql
index 0ebcfaf7f..873781d65 100644
--- a/java/google/registry/reporting/sql/activity_report_aggregation.sql
+++ b/java/google/registry/reporting/sql/activity_report_aggregation.sql
@@ -21,8 +21,8 @@ SELECT
   SUM(IF(metricName = 'operational-registrars', count, 0)) AS operational_registrars,
   SUM(IF(metricName = 'ramp-up-registrars', count, 0)) AS ramp_up_registrars,
   SUM(IF(metricName = 'pre-ramp-up-registrars', count, 0)) AS pre_ramp_up_registrars,
-  -- We don't support ZFA over SFTP, only AXFR.
-  0 AS zfa_passwords,
+  -- We use the Centralized Zone Data Service.
+  "CZDS" AS zfa_passwords,
   SUM(IF(metricName = 'whois-43-queries', count, 0)) AS whois_43_queries,
   SUM(IF(metricName = 'web-whois-queries', count, 0)) AS web_whois_queries,
   -- We don't support searchable WHOIS.
diff --git a/java/google/registry/reporting/sql/registrar_operating_status.sql b/java/google/registry/reporting/sql/registrar_operating_status.sql
index 0065e1b37..63b9e40f1 100644
--- a/java/google/registry/reporting/sql/registrar_operating_status.sql
+++ b/java/google/registry/reporting/sql/registrar_operating_status.sql
@@ -13,21 +13,15 @@
   -- See the License for the specific language governing permissions and
   -- limitations under the License.
 
-  -- Query for all registrar statuses:
-  -- production, ramping up (OTE), or pre-ramp-up (requested).
+  -- Query that counts the number of real registrars in system.
 
 SELECT
   -- Applies to all TLDs, hence the 'null' magic value.
   STRING(NULL) AS tld,
-  CASE WHEN access_type = 'PROD' AND registrar_name IS NOT NULL
-    THEN 'operational-registrars'
-  WHEN access_type = 'OTE' AND registrar_name IS NOT NULL
-    THEN 'ramp-up-registrars'
-  WHEN access_type IS NULL AND registrar_name IS NOT NULL
-    THEN 'pre-ramp-up-registrars'
-  -- The import process is imprecise; filter out invalid rows.
-  ELSE 'not-applicable' END AS metricName,
-  COUNT(registrar_id) AS count
+  'operational-registrars' AS metricName,
+  COUNT(registrarName) AS count
 FROM
-  `%PROJECT_ID%.%REGISTRAR_DATA_SET%.%REGISTRAR_STATUS_TABLE%`
+  `%PROJECT_ID%.%DATASTORE_EXPORT_DATA_SET%.%REGISTRAR_TABLE%`
+WHERE
+  type = 'REAL'
 GROUP BY metricName
diff --git a/javatests/google/registry/reporting/testdata/activity_report_aggregation_test.sql b/javatests/google/registry/reporting/testdata/activity_report_aggregation_test.sql
index 35e0f8fae..a0dbcda86 100644
--- a/javatests/google/registry/reporting/testdata/activity_report_aggregation_test.sql
+++ b/javatests/google/registry/reporting/testdata/activity_report_aggregation_test.sql
@@ -21,8 +21,8 @@ SELECT
   SUM(IF(metricName = 'operational-registrars', count, 0)) AS operational_registrars,
   SUM(IF(metricName = 'ramp-up-registrars', count, 0)) AS ramp_up_registrars,
   SUM(IF(metricName = 'pre-ramp-up-registrars', count, 0)) AS pre_ramp_up_registrars,
-  -- We don't support ZFA over SFTP, only AXFR.
-  0 AS zfa_passwords,
+  -- We use the Centralized Zone Data Service.
+  "CZDS" AS zfa_passwords,
   SUM(IF(metricName = 'whois-43-queries', count, 0)) AS whois_43_queries,
   SUM(IF(metricName = 'web-whois-queries', count, 0)) AS web_whois_queries,
   -- We don't support searchable WHOIS.
diff --git a/javatests/google/registry/reporting/testdata/registrar_operating_status_test.sql b/javatests/google/registry/reporting/testdata/registrar_operating_status_test.sql
index e6fe201f5..bf1a3ed94 100644
--- a/javatests/google/registry/reporting/testdata/registrar_operating_status_test.sql
+++ b/javatests/google/registry/reporting/testdata/registrar_operating_status_test.sql
@@ -13,21 +13,15 @@
   -- See the License for the specific language governing permissions and
   -- limitations under the License.
 
-  -- Query for all registrar statuses:
-  -- production, ramping up (OTE), or pre-ramp-up (requested).
+  -- Query that counts the number of real registrars in system.
 
 SELECT
   -- Applies to all TLDs, hence the 'null' magic value.
   STRING(NULL) AS tld,
-  CASE WHEN access_type = 'PROD' AND registrar_name IS NOT NULL
-    THEN 'operational-registrars'
-  WHEN access_type = 'OTE' AND registrar_name IS NOT NULL
-    THEN 'ramp-up-registrars'
-  WHEN access_type IS NULL AND registrar_name IS NOT NULL
-    THEN 'pre-ramp-up-registrars'
-  -- The import process is imprecise; filter out invalid rows.
-  ELSE 'not-applicable' END AS metricName,
-  COUNT(registrar_id) AS count
+  'operational-registrars' AS metricName,
+  COUNT(registrarName) AS count
 FROM
-  `domain-registry-alpha.registrar_data.registrar_status`
+  `domain-registry-alpha.latest_datastore_export.Registrar`
+WHERE
+  type = 'REAL'
 GROUP BY metricName