diff --git a/.github/workflows/build-k3s.yaml b/.github/workflows/build-k3s.yaml
index 47ba18e247ee..bc69ac7d0337 100644
--- a/.github/workflows/build-k3s.yaml
+++ b/.github/workflows/build-k3s.yaml
@@ -3,6 +3,10 @@ name: Build K3s
 on: 
   workflow_call:
    inputs:
+    arch:
+      type: string
+      description: 'Architecture to build'
+      default: 'ubuntu-latest'
     upload-repo:
       type: boolean
       required: false
@@ -18,11 +22,16 @@ permissions:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.arch }} # defaults to ubuntu-latest, for arm64 use oracle-aarch64-4cpu-16gb
     timeout-minutes: 20
     steps:
     - name: Checkout K3s
       uses: actions/checkout@v4
+    - name: Setup arm64 Runner
+      if: contains(inputs.arch, 'aarch64')
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y make
     - name: Build K3s binary
       run: |
         DOCKER_BUILDKIT=1 SKIP_IMAGE=1 SKIP_AIRGAP=1 SKIP_VALIDATE=1 GOCOVER=1 make
@@ -44,9 +53,15 @@ jobs:
     - name: "Save K3s image"
       if: inputs.upload-image == true
       run: docker image save rancher/k3s -o ./dist/artifacts/k3s-image.tar
-    - name: "Upload K3s binary"
-      if: inputs.upload-repo == false
+    - name: "Upload K3s Artifacts"
+      if: inputs.upload-repo == false && inputs.arch == 'ubuntu-latest'
       uses: actions/upload-artifact@v4
       with:
         name: k3s
+        path: dist/artifacts/k3s*
+    - name: "Upload K3s arm64 Artifacts"
+      if: contains(inputs.arch, 'aarch64')
+      uses: actions/upload-artifact@v4
+      with:
+        name: k3s-arm64
         path: dist/artifacts/k3s*
\ No newline at end of file
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 2ba4b3e64e31..baa90ff70303 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -32,6 +32,12 @@ jobs:
     uses: ./.github/workflows/build-k3s.yaml
     with:
       upload-image: true
+  build-arm64:
+    if : github.repository == 'k3s-io/k3s'
+    uses: ./.github/workflows/build-k3s.yaml
+    with:
+      arch: oracle-aarch64-4cpu-16gb
+      upload-image: true
   e2e:
     name: "E2E Tests"
     needs: build
@@ -213,4 +219,58 @@ jobs:
           ./${{ matrix.dtest }}.test -k3sImage=$K3S_IMAGE -branch=$BRANCH_NAME
         else
           ./${{ matrix.dtest }}.test -k3sImage=$K3S_IMAGE
-        fi
\ No newline at end of file
+        fi
+
+  docker-arm64:
+    # needs: build-arm64
+    name: Docker Tests Arm64
+    if: github.repository == 'k3s-io/k3s'
+    runs-on: oracle-aarch64-4cpu-16gb
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        dtest: [basics, bootstraptoken, cacerts, compat, upgrade]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with: 
+        go-version-file: 'go.mod'
+        cache: false
+    - name: Install Support Tools
+      run: |
+        sudo apt-get update && sudo apt-get install -y wget gawk openssh-client openssh-server net-tools iptables
+        sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O /usr/bin/yq &&\
+        sudo chmod +x /usr/bin/yq
+        curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"
+        sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+        mkdir -p /home/runner/.upterm
+    # - name: "Download k3s image"
+    #   uses: actions/download-artifact@v4
+    #   with:
+    #     name: k3s-arm64
+    #     path: ./dist/artifacts
+    # - name: Load k3s image
+    #   run: docker image load -i ./dist/artifacts/k3s-image.tar
+    # - name: Run ${{ matrix.dtest }} Test
+    #   run: |
+    #     mv ./dist/artifacts/k3s-arm64 ./dist/artifacts/k3s 
+    #     chmod +x ./dist/artifacts/k3s
+    #     . ./scripts/version.sh
+    #     . ./tests/docker/test-helpers
+    #     . ./tests/docker/test-run-${{ matrix.dtest }}
+    #     echo "Did test-run-${{ matrix.dtest }} pass $?"
+    - name: Check user
+      run: |
+        echo "User is $(whoami)"
+        echo "My Home is $HOME"
+    - name: Launch Debug Session
+      uses:  mxschmitt/action-tmate@v3
+      # if: ${{ failure() }}
+      # with:
+        ## If no one connects after 5 minutes, shut down server.
+        # wait-timeout-minutes: 5
\ No newline at end of file
diff --git a/tests/docker/test-run-basics b/tests/docker/test-run-basics
index a221b5b7c30e..c3fde55242f8 100755
--- a/tests/docker/test-run-basics
+++ b/tests/docker/test-run-basics
@@ -11,6 +11,11 @@ export NUM_SERVERS=1
 export NUM_AGENTS=1
 export WAIT_SERVICES="${all_services[@]}"
 
+if [ "$(uname -i)" = "aarch64" ]; then
+    export SERVER_ARGS="--snapshotter=native"
+    export AGENT_ARGS="--snapshotter=native"
+fi
+
 start-test() {
     use-local-storage-volume
     docker exec $(cat $TEST_DIR/servers/1/metadata/name) check-config || true