diff --git a/.circleci/config.yml b/.circleci/config.yml
index d78f984..21e6f98 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,22 +2,16 @@
 version: 2.1
 orbs:
   go: circleci/go@1.6.0
-executors:
-  go:
+jobs:
+  build:
     docker:
       - image: cimg/go:<< parameters.tag >>
-    environment:
-      GOOS: 'linux'
-      GOARCH: 'amd64'
     parameters:
       tag:
         type: string
-jobs:
-  build:
-    executor:
-      name: go
-      tag: '1.14'
     environment:
+      GOOS: 'linux'
+      GOARCH: 'amd64'
       ARTIFACTS: /tmp/artifacts
       TEST_RESULTS: /tmp/test-results
     steps:
@@ -50,5 +44,10 @@ workflows:
   version: 2
   build:
     jobs:
-      - build: {}
-...
+      - build:
+          name: build-go<< matrix.tag >>
+          matrix:
+            parameters:
+              tag:
+                - "1.15"
+                - "1.16"