diff --git a/.github/workflows/manual-uri.yml b/.github/workflows/manual-uri.yml
index 836bebf..65d4f74 100644
--- a/.github/workflows/manual-uri.yml
+++ b/.github/workflows/manual-uri.yml
@@ -9,6 +9,7 @@ on:
         options:
           - 'ubuntu-latest'
           - 'macos-latest'
+          - 'macos-14'
           - 'windows-latest'
       uri:
         description: 'URI of JDK archive file to download'
diff --git a/.github/workflows/manual-website-release-version.yml b/.github/workflows/manual-website-release-version.yml
index 87afaa2..16e0b6b 100644
--- a/.github/workflows/manual-website-release-version.yml
+++ b/.github/workflows/manual-website-release-version.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-latest, macos-14, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: 'Check out repository'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94b6ddf..732407a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@ This project uses tags and branches for [release management](https://docs.github
 
 
 ## [Unreleased]
-_nothing noteworthy, yet_
+### Fixed
+- Support running on ARM64 machines [#63](https://github.com/oracle-actions/setup-java/issues/63)
 
 ## [1.3.3] - 2024-01-29
 ### Changed
diff --git a/action.yml b/action.yml
index 1e44309..b3b6b62 100644
--- a/action.yml
+++ b/action.yml
@@ -47,6 +47,10 @@ runs:
       shell: bash
       run: |
         JAVA=$JAVA_HOME_17_X64/bin/java
+        if [ ! -d "$JAVA_HOME_17_X64" ]; then
+          JAVA=$JAVA_HOME_17_arm64/bin/java
+        fi
+        $JAVA --version
         DOWNLOAD=$GITHUB_ACTION_PATH/src/Download.java
         if [ ! -z "${{ inputs.uri }}" ]; then
           $JAVA \