diff --git a/production/values-geo2grid-g16-radf.yaml b/production/values-geo2grid-g16-radf.yaml
index 02c0a0e9feb3185984d40282cdf1b0f17cb01758..e4029c95a5c3949f62668e60ced2670cf299a8d8 100644
--- a/production/values-geo2grid-g16-radf.yaml
+++ b/production/values-geo2grid-g16-radf.yaml
@@ -3,6 +3,10 @@ rabbitIn:
   username: "user"
   passwordSecret: "geosphere-rabbit-rabbitmq"
   topic: "data.goes.g16.abi.radf.l1b.netcdf.all.complete"
+rabbitOut:
+  host: "geosphere-rabbit-rabbitmq"
+  username: "user"
+  passwordSecret: "geosphere-rabbit-rabbitmq"
 source:
   s3Endpoint: "http://geosphere-minio:9000"
 destination:
diff --git a/production/values-grb-g16.yaml b/production/values-grb-g16.yaml
index e02a48c27b3626532624ebdb9aba281f7afffd90..b1edacffbf2b5a5cefb04e63a57c6e0e32d8e555 100644
--- a/production/values-grb-g16.yaml
+++ b/production/values-grb-g16.yaml
@@ -1,8 +1,4 @@
-grbProcessor:
-  env:
-    - name: APID_FILTER
-      value: "GOES-16-ABI-Only.xml"
-
+apidFilter: "GOES-16-ABI-Only.xml"
 fanoutServer: "fanout1.ssec.wisc.edu"
 uploadDst: "s3://g16-abi-l1b-netcdf"
 s3Endpoint: "http://geosphere-minio:9000"