diff --git a/.github/workflows/update-casks.yml b/.github/workflows/update-casks.yml
index b9fedcdd..4678494d 100644
--- a/.github/workflows/update-casks.yml
+++ b/.github/workflows/update-casks.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: jimeh/build-emacs-for-macos
-          ref: "v0.6.9"
+          ref: "v0.6.17"
           path: builder
       - uses: actions/setup-go@v2
         with:
diff --git a/templates/emacs-app-good.rb.tpl b/templates/emacs-app-good.rb.tpl
index dad9aaca..7f9b0c80 100644
--- a/templates/emacs-app-good.rb.tpl
+++ b/templates/emacs-app-good.rb.tpl
@@ -3,8 +3,8 @@
 cask 'emacs-app-good' do
   version '{{ .Version }}'
 
-  sha256 '{{ .SHA256 "macOS-10-15.x86_64" }}'
-  url '{{ .DownloadURL "macOS-10-15.x86_64" }}'
+  sha256 '{{ .SHA256 "macOS-10-15" "x86_64" }}'
+  url '{{ .DownloadURL "macOS-10-15" "x86_64" }}'
 
   name 'Emacs'
   desc 'GNU Emacs text editor (known good nightly build)'
diff --git a/templates/emacs-app-nightly.rb.tpl b/templates/emacs-app-nightly.rb.tpl
index 9589020a..8f57bdd6 100644
--- a/templates/emacs-app-nightly.rb.tpl
+++ b/templates/emacs-app-nightly.rb.tpl
@@ -3,8 +3,8 @@
 cask 'emacs-app-nightly' do
   version '{{ .Version }}'
 
-  sha256 '{{ .SHA256 "macOS-10-15.x86_64" }}'
-  url '{{ .DownloadURL "macOS-10-15.x86_64" }}'
+  sha256 '{{ .SHA256 "macOS-10-15" "x86_64" }}'
+  url '{{ .DownloadURL "macOS-10-15" "x86_64" }}'
 
   name 'Emacs'
   desc 'GNU Emacs text editor (nightly build)'
diff --git a/templates/emacs-app.rb.tpl b/templates/emacs-app.rb.tpl
index 47a8149d..34413a04 100644
--- a/templates/emacs-app.rb.tpl
+++ b/templates/emacs-app.rb.tpl
@@ -3,8 +3,8 @@
 cask 'emacs-app' do
   version '{{ .Version }}'
 
-  sha256 '{{ .SHA256 "macOS-10-15.x86_64" }}'
-  url '{{ .DownloadURL "macOS-10-15.x86_64" }}'
+  sha256 '{{ .SHA256 "macOS-10-15" "x86_64" }}'
+  url '{{ .DownloadURL "macOS-10-15" "x86_64" }}'
 
   name 'Emacs'
   desc 'GNU Emacs text editor'