diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22d896f061c..0410a0da259 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,7 +180,7 @@ jobs:
 
   build_packages:
     docker:
-      - image: us-east1-docker.pkg.dev/influxdata-team-edge/ci-support/ci-packager:latest
+      - image: us-east1-docker.pkg.dev/influxdata-team-edge/ci-support/ci-packager-next@sha256:c92ea43b5529b9c4f93478c26d128b3a5aa811559e1fa634cdb476241f8d7620
         auth:
           username: _json_key
           password: $CISUPPORT_GCS_AUTHORIZATION
diff --git a/.circleci/packages/config.yaml b/.circleci/packages/config.yaml
index 9c3cbf43a22..116b6c25b8a 100644
--- a/.circleci/packages/config.yaml
+++ b/.circleci/packages/config.yaml
@@ -1,9 +1,8 @@
 ---
 version:
-  release:
-    match: '^v[0-9]+.[0-9]+.[0-9]+'
+  - match: '^v[0-9]+.[0-9]+.[0-9]+'
     value: '{{env.CIRCLE_TAG[1:]}}'
-  default:
+  - match: '.*'
     value: '1.x-{{env.CIRCLE_SHA1[:8]}}'
 
 sources:
@@ -31,6 +30,11 @@ packages:
   - name:        influxdb
     description: Distributed time-series database.
     license:     MIT
+    vendor:      InfluxData
+    homepage:    https://influxdata.com
+    maintainer:
+      name:  support
+      email: support@influxdata.com
     binaries:
       # linux, darwin
       - influx
@@ -86,3 +90,9 @@ packages:
       - 750,influxdb,influxdb:/var/log/influxdb
       - 750,influxdb,influxdb:/var/lib/influxdb
     source: .circleci/packages/influxdb
+    deb:
+      recommends:
+        - influxdata-archive-keyring
+    rpm:
+      recommends:
+        - influxdata-archive-keyring