diff --git a/.circleci/config.yml b/.circleci/config.yml
index 690eaa915..26758b951 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,11 +66,11 @@ commands:
       - when:
           condition: << parameters.release >>
           steps: 
-            - run: 'debian=1 centos=1 mac=1 freebsd=1 linux=1 windows=1 make package'
+            - run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 make package'
       - when:
           condition: << parameters.nightly >>
           steps: 
-            - run: 'debian=1 centos=1 mac=1 freebsd=1 linux=1 windows=1 NIGHTLY=1 make package'
+            - run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 NIGHTLY=1 make package'
             - run: 'make upload-nightly'
       - unless:
           condition: << parameters.nightly >>
@@ -157,31 +157,61 @@ jobs:
     steps:
       - package-build:
           type: windows
-  debian-package:
+  darwin-package:
     executor: go-1_16
     steps:
       - package-build:
-          type: debian
-  centos-package:
+          type: darwin
+  i386-package:
     executor: go-1_16
     steps:
       - package-build:
-          type: centos
-  mac-package:
+          type: i386
+  ppc641e-package:
     executor: go-1_16
     steps:
       - package-build:
-          type: mac
-  freebsd-package:
+          type: ppc641e
+  s390x-package:
     executor: go-1_16
     steps:
       - package-build:
-          type: freebsd
-  linux-package:
+          type: s390x
+  armel-package:
     executor: go-1_16
     steps:
       - package-build:
-          type: linux
+          type: armel
+  amd64-package:
+    executor: go-1_16
+    steps:
+      - package-build:
+          type: amd64
+  arm64-package:
+    executor: go-1_16
+    steps:
+      - package-build:
+          type: arm64
+  mipsel-package:
+    executor: go-1_16
+    steps:
+      - package-build:
+          type: mipsel
+  mips-package:
+    executor: go-1_16
+    steps:
+      - package-build:
+          type: mips
+  static-package:
+    executor: go-1_16
+    steps:
+      - package-build:
+          type: static
+  armhf-package:
+    executor: go-1_16
+    steps:
+      - package-build:
+          type: armhf
 
   release:
     executor: go-1_16
@@ -307,29 +337,53 @@ workflows:
       - 'windows-package':
           requires: 
             - 'test-go-windows'
-      - 'debian-package':
-          requires: 
-            - 'test-awaiter'
-      - 'centos-package':
-          requires: 
-            - 'test-awaiter'
-      - 'mac-package':
+      - 'darwin-package':
           requires: 
             - 'test-go-mac'
-      - 'freebsd-package':
+      - 'i386-package':
           requires: 
             - 'test-awaiter'
-      - 'linux-package':
+      - 'ppc641e-package':
+          requires: 
+            - 'test-awaiter'
+      - 's390x-package':
+          requires: 
+            - 'test-awaiter'
+      - 'armel-package':
+          requires: 
+            - 'test-awaiter'
+      - 'amd64-package':
+          requires: 
+            - 'test-awaiter'
+      - 'arm64-package':
+          requires: 
+            - 'test-awaiter'
+      - 'armhf-package':
+          requires: 
+            - 'test-awaiter'
+      - 'static-package':
+          requires:
+            - 'test-awaiter'
+      - 'mipsel-package':
+          requires: 
+            - 'test-awaiter'
+      - 'mips-package':
           requires: 
             - 'test-awaiter'
       - 'share-artifacts':
           requires:
-            - 'linux-package'
-            - 'freebsd-package'
-            - 'mac-package'
-            - 'centos-package'
-            - 'debian-package'
+            - 'i386-package'
+            - 'ppc641e-package'
+            - 's390x-package'
+            - 'armel-package'
+            - 'amd64-package'
+            - 'mipsel-package'
+            - 'mips-package'
+            - 'darwin-package'
             - 'windows-package'
+            - 'static-package'
+            - 'arm64-package'
+            - 'armhf-package'
           filters:
             branches:
               ignore:
diff --git a/Makefile b/Makefile
index 2e3e7e355..f0b92fc35 100644
--- a/Makefile
+++ b/Makefile
@@ -228,53 +228,71 @@ $(buildbin):
 	@mkdir -pv $(dir $@)
 	go build -o $(dir $@) -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
-ifdef debian
-debs := telegraf_$(deb_version)_amd64.deb
-debs += telegraf_$(deb_version)_arm64.deb
-debs += telegraf_$(deb_version)_armel.deb
-debs += telegraf_$(deb_version)_armhf.deb
-debs += telegraf_$(deb_version)_i386.deb
+ifdef mips
 debs += telegraf_$(deb_version)_mips.deb
-debs += telegraf_$(deb_version)_mipsel.deb
-debs += telegraf_$(deb_version)_s390x.deb
-debs += telegraf_$(deb_version)_ppc64el.deb
+tars += telegraf-$(tar_version)_linux_mips.tar.gz
 endif
 
-ifdef centos
+ifdef mipsel
+debs += telegraf_$(deb_version)_mipsel.deb
+tars += telegraf-$(tar_version)_linux_mipsel.tar.gz
+endif
+
+ifdef arm64
+tars += telegraf-$(tar_version)_linux_arm64.tar.gz
+debs += telegraf_$(deb_version)_arm64.deb
 rpms += telegraf-$(rpm_version).aarch64.rpm
-rpms += telegraf-$(rpm_version).armel.rpm
-rpms += telegraf-$(rpm_version).armv6hl.rpm
-rpms += telegraf-$(rpm_version).i386.rpm
-rpms += telegraf-$(rpm_version).s390x.rpm
-rpms += telegraf-$(rpm_version).ppc64le.rpm
+endif
+
+ifdef amd64
+tars += telegraf-$(tar_version)_freebsd_amd64.tar.gz
+tars += telegraf-$(tar_version)_linux_amd64.tar.gz
+debs := telegraf_$(deb_version)_amd64.deb
 rpms += telegraf-$(rpm_version).x86_64.rpm
 endif
 
-ifdef mac
-tars += telegraf-$(tar_version)_darwin_amd64.tar.gz
-endif
-
-ifdef freebsd
-tars += telegraf-$(tar_version)_freebsd_amd64.tar.gz
-tars += telegraf-$(tar_version)_freebsd_i386.tar.gz
-endif
-
-ifdef linux
-tars += telegraf-$(tar_version)_linux_amd64.tar.gz
-tars += telegraf-$(tar_version)_linux_arm64.tar.gz
-tars += telegraf-$(tar_version)_linux_armel.tar.gz
-tars += telegraf-$(tar_version)_linux_armhf.tar.gz
-tars += telegraf-$(tar_version)_linux_i386.tar.gz
-tars += telegraf-$(tar_version)_linux_mips.tar.gz
-tars += telegraf-$(tar_version)_linux_mipsel.tar.gz
-tars += telegraf-$(tar_version)_linux_s390x.tar.gz
-tars += telegraf-$(tar_version)_linux_ppc64le.tar.gz
+ifdef static 
 tars += telegraf-$(tar_version)_static_linux_amd64.tar.gz
 endif
 
+ifdef armel
+tars += telegraf-$(tar_version)_linux_armel.tar.gz
+rpms += telegraf-$(rpm_version).armel.rpm
+debs += telegraf_$(deb_version)_armel.deb
+endif
+
+ifdef armhf
+tars += telegraf-$(tar_version)_linux_armhf.tar.gz
+debs += telegraf_$(deb_version)_armhf.deb
+rpms += telegraf-$(rpm_version).armv6hl.rpm
+endif 
+
+ifdef s390x
+tars += telegraf-$(tar_version)_linux_s390x.tar.gz
+debs += telegraf_$(deb_version)_s390x.deb
+rpms += telegraf-$(rpm_version).s390x.rpm
+endif
+
+ifdef ppc641e
+tars += telegraf-$(tar_version)_linux_ppc64le.tar.gz
+rpms += telegraf-$(rpm_version).ppc64le.rpm
+debs += telegraf_$(deb_version)_ppc64el.deb
+endif
+
+ifdef i386
+tars += telegraf-$(tar_version)_freebsd_i386.tar.gz
+debs += telegraf_$(deb_version)_i386.deb
+tars += telegraf-$(tar_version)_linux_i386.tar.gz
+rpms += telegraf-$(rpm_version).i386.rpm
+endif
+
 ifdef windows
-zips += telegraf-$(tar_version)_windows_amd64.zip
 zips += telegraf-$(tar_version)_windows_i386.zip
+zips += telegraf-$(tar_version)_windows_amd64.zip
+endif
+
+ifdef darwin
+tars += telegraf-$(tar_version)_darwin_amd64.tar.gz
 endif
 
 dists := $(debs) $(rpms) $(tars) $(zips)