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..fb5c2ba 100644
--- a/action.yml
+++ b/action.yml
@@ -47,6 +47,9 @@ 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
         DOWNLOAD=$GITHUB_ACTION_PATH/src/Download.java
         if [ ! -z "${{ inputs.uri }}" ]; then
           $JAVA \