diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 4f31285fbb..084fc85011 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
+        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
 
     runs-on: ${{ matrix.os }}
     
@@ -25,17 +25,17 @@ jobs:
       run: |
         sudo apt update
 
-        if [ "${{ matrix.os }}" == "ubuntu-24.04" ]; then
+        if [[ ${{ matrix.os }} == ubuntu-24.04* ]]; then
             sudo apt-get install ninja-build doxygen graphviz libcurl4-openssl-dev libprotobuf-dev libprotoc-dev protobuf-compiler libhdf5-dev libyaml-cpp-dev
             sudo apt-get install qt6-base-dev qt6-svg-dev
             sudo apt-get install libgtest-dev
             sudo apt-get install python3 python3-venv python3-dev
-        elif [ "${{ matrix.os }}" == "ubuntu-22.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-22.04* ]]; then
             sudo apt-get install ninja-build doxygen graphviz libcurl4-openssl-dev libprotobuf-dev libprotoc-dev protobuf-compiler libhdf5-dev libyaml-cpp-dev
             sudo apt-get install qtbase5-dev libqt5opengl5-dev libqt5svg5-dev 
             sudo apt-get install libgtest-dev
             sudo apt-get install python3 python3-venv python3-dev
-        elif [ "${{ matrix.os }}" == "ubuntu-20.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-20.04* ]]; then
             sudo apt-get install ninja-build doxygen graphviz libcurl4-openssl-dev libprotobuf-dev libprotoc-dev protobuf-compiler libhdf5-dev libyaml-cpp-dev
             sudo apt-get install qt5-default libqt5opengl5-dev libqt5svg5-dev 
             sudo apt-get install libgtest-dev
@@ -44,13 +44,13 @@ jobs:
 
     - name: Set variables
       run: |
-        if [ "${{ matrix.os }}" == "ubuntu-24.04" ]; then
+        if [[ ${{ matrix.os }} == ubuntu-24.04* ]]; then
           echo "ubuntu_codename=noble"        >> "$GITHUB_ENV"
           echo "python_version=3"             >> "$GITHUB_ENV"   # => default python 3 version
-        elif [ "${{ matrix.os }}" == "ubuntu-22.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-22.04* ]]; then
           echo "ubuntu_codename=jammy"        >> "$GITHUB_ENV"
           echo "python_version=3"             >> "$GITHUB_ENV"   # => default python 3 version
-        elif [ "${{ matrix.os }}" == "ubuntu-20.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-20.04* ]]; then
           echo "ubuntu_codename=focal"        >> "$GITHUB_ENV"
           echo "python_version=3.9"           >> "$GITHUB_ENV"
         fi
@@ -133,7 +133,7 @@ jobs:
         -DCMAKE_INSTALL_SYSCONFDIR=/etc \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu \
+        -DCMAKE_INSTALL_LIBDIR=lib/$(arch)-linux-gnu \
         -DPython_FIND_VIRTUALENV=ONLY
       shell: bash