diff --git a/.github/workflows/wear-ci.yml b/.github/workflows/wear-ci.yml
index dc948ab..51cc623 100644
--- a/.github/workflows/wear-ci.yml
+++ b/.github/workflows/wear-ci.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Validate WFF XML
diff --git a/watchface-tools b/watchface-tools
index 21c55e6..28877b2 160000
--- a/watchface-tools
+++ b/watchface-tools
@@ -1 +1 @@
-Subproject commit 21c55e660cd0078c00650ff0ec3ef4e50c647166
+Subproject commit 28877b229416f288b9317380160b157d1e5d2344