diff --git a/.drone.yml b/.drone.yml
index 9ebde6c4..ee02b8dd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,8 +17,10 @@ steps:
 # https://docker-runner.docs.drone.io/configuration/trigger/
 trigger:
   branch:
+    - aarch64-m1
     - archs
     - master
+    - relprep
 
 ---
 kind: pipeline
@@ -36,9 +38,10 @@ steps:
       - apt-get install -yq --no-install-suggests --no-install-recommends
                 build-essential file bash gcc make autotools-dev automake autoconf libtool
                 libtext-diff-perl pkg-config
-      - build-aux/autogen.sh
       - build-aux/conf-make-check.sh
 trigger:
   branch:
+    - aarch64-m1
     - archs
     - master
+    - relprep
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8933d64e..763cf29f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -142,3 +142,23 @@ jobs:
     #    asset_path: ./configure.gz
     #    asset_name: configure.gz
     #    asset_content_type: application/gzip
+  aarch64:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v2.7.1
+        name: Check on aarch64
+        id: runcmd
+        with:
+          arch: aarch64
+          githubToken: ${{ github.token }}
+          distro: ubuntu_latest
+          install: |
+            apt-get update -q -y
+            apt-get install -y make gcc grep bash file git libtool automake autoconf \
+                               libtext-diff-perl pkg-config
+            git config --global --add safe.directory /home/runner/work/safeclib/safeclib
+          run: |
+            build-aux/autogen.sh
+            build-aux/conf-make-check.sh
diff --git a/Dockerfile-fedora-aarch64 b/Dockerfile-fedora-aarch64
index 499b91fb..36486f55 100644
--- a/Dockerfile-fedora-aarch64
+++ b/Dockerfile-fedora-aarch64
@@ -18,16 +18,17 @@ RUN sed -i '/^enabled=1$/ s/1/0/' /etc/yum.repos.d/*-modular.repo || true
 RUN dnf -y --allowerasing --repo fedora install \
   file gcc git make redhat-rpm-config sudo \
   automake autoconf libtool perl-Text-Diff pkgconf-pkg-config strace gdb
-#RUN dnf -y --repo fedora install m4 libtool perl-Text-Diff pkgconf-pkg-config strace gdb
-#RUN dnf -y --repo fedora install strace gdb
+#RUN dnf -y --repo fedora install m4
 
 # Create test user and the environment
 RUN useradd "${TEST_USER}"
-WORKDIR "${WORK_DIR}"
-COPY . .
-RUN chown -R "${TEST_USER}:${TEST_USER}" "${WORK_DIR}"
-
 # Enable sudo without password for convenience.
 RUN echo "${TEST_USER} ALL = NOPASSWD: ALL" >> /etc/sudoers
 
+WORKDIR "${WORK_DIR}"
+COPY . .
+RUN chown -R "${TEST_USER}:${TEST_USER}" "${WORK_DIR}"
 USER "${TEST_USER}"
+
+RUN ./configure --host=aarch64-linux-gnu --disable-shared --enable-debug
+RUN make
diff --git a/run-aarch64.sh b/run-aarch64.sh
index 5dab056e..71ca5805 100755
--- a/run-aarch64.sh
+++ b/run-aarch64.sh
@@ -2,5 +2,5 @@
 # ./configure --host=aarch64-linux-gnu --disable-shared --enable-debug
 # echo to avoid libssp
 # sed -i 's,-fstack-protector-strong -fstack-clash-protection,,' Makefile */Makefile
-docker build --rm  -f Dockerfile-fedora-aarch64 -t aarch64 .
-docker run --rm -t aarch64 $@
+docker build -f Dockerfile-fedora-aarch64 -t safeclib-aarch64 .
+docker run --rm -t safeclib-aarch64 -it $@