diff --git a/.circleci/config.yml b/.circleci/config.yml
index be8a7102a..33bd4d00f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,3 +1,4 @@
+---
 # We use github actions to test the code on windows and linux amd64. Circleci is used for linux arm64.
 #
 version: 2.1
@@ -9,7 +10,7 @@ executors:
   linux_arm64:
     description: "arm64"
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:2022.04.1
     resource_class: arm.medium
 
 commands:
@@ -18,7 +19,7 @@ commands:
       version:
         type: string
     steps:
-      - os-detect/init # this setup the '$SUDO' variable
+      - os-detect/init  # this setup the '$SUDO' variable
       - run:
           name: "install Golang linux"
           command: |
@@ -72,4 +73,11 @@ workflows:
       - tests_arm64:
           matrix:
             parameters:
-              go-version: ["1.13", "1.14", "1.15", "1.16", "1.17"]
+              go-version:
+                - "1.13"
+                - "1.14"
+                - "1.15"
+                - "1.16"
+                - "1.17"
+                - "1.18"
+                - "1.19"
diff --git a/statsd/benchmark_report_metric_noop_test.go b/statsd/benchmark_report_metric_noop_test.go
index 8e1cabd87..837e91d5a 100644
--- a/statsd/benchmark_report_metric_noop_test.go
+++ b/statsd/benchmark_report_metric_noop_test.go
@@ -1,3 +1,4 @@
+//go:build !go1.13
 // +build !go1.13
 
 package statsd_test
diff --git a/statsd/benchmark_report_metric_test.go b/statsd/benchmark_report_metric_test.go
index dcf0f522a..cb7325e14 100644
--- a/statsd/benchmark_report_metric_test.go
+++ b/statsd/benchmark_report_metric_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 package statsd_test
diff --git a/statsd/end_to_end_uds_test.go b/statsd/end_to_end_uds_test.go
index be4f4b9a3..7f15f1a37 100644
--- a/statsd/end_to_end_uds_test.go
+++ b/statsd/end_to_end_uds_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package statsd
diff --git a/statsd/pipe.go b/statsd/pipe.go
index 84c38e966..426359c5f 100644
--- a/statsd/pipe.go
+++ b/statsd/pipe.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package statsd
diff --git a/statsd/pipe_windows.go b/statsd/pipe_windows.go
index 5ab60f00c..2ca85f70f 100644
--- a/statsd/pipe_windows.go
+++ b/statsd/pipe_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package statsd
diff --git a/statsd/pipe_windows_test.go b/statsd/pipe_windows_test.go
index 1efbf2b8d..0a3279e70 100644
--- a/statsd/pipe_windows_test.go
+++ b/statsd/pipe_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package statsd
diff --git a/statsd/uds.go b/statsd/uds.go
index fa5f5917f..510a7603b 100644
--- a/statsd/uds.go
+++ b/statsd/uds.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package statsd
diff --git a/statsd/uds_test.go b/statsd/uds_test.go
index fb1c0c829..939b3e2c1 100644
--- a/statsd/uds_test.go
+++ b/statsd/uds_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package statsd
diff --git a/statsd/uds_windows.go b/statsd/uds_windows.go
index 077894a33..bd358aefc 100644
--- a/statsd/uds_windows.go
+++ b/statsd/uds_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package statsd