diff --git a/.goreleaser.yml b/.goreleaser.yml
index c0be8dd..9a78ea8 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -6,6 +6,7 @@ builds:
       - darwin
     goarch:
       - amd64
+      - arm64
     # Include the default settings from https://goreleaser.com/#builds
     # Also include static compilation
     # ldflags: -d -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -extldflags "-static"
diff --git a/screwdriver.yaml b/screwdriver.yaml
index 76c576f..450f2d5 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -4,7 +4,7 @@ shared:
         GO111MODULE: on
 jobs:
     main:
-        image: golang:1.14
+        image: golang:1.17
         environment:
             SD_SONAR_OPTS:  "-Dsonar.sources=./ -Dsonar.exclusions=**/*_test.go,**/vendor/** -Dsonar.tests=./ -Dsonar.test.inclusions=**/*_test.go -Dsonar.test.exclusions=**/vendor/** -Dsonar.go.coverage.reportPaths=${SD_ARTIFACTS_DIR}/coverage.out -Dsonar.go.tests.reportPaths=${SD_ARTIFACTS_DIR}/report.json"
         requires: [~commit, ~pr]
@@ -20,7 +20,7 @@ jobs:
             # Test cross-compiling as well
             - test-release: "curl -sL https://git.io/goreleaser | bash -s -- --snapshot"
     publish:
-        image: golang:1.14
+        image: golang:1.17
         requires: main
         steps:
             - setup-ci: git clone https://github.com/screwdriver-cd/toolbox.git ci