diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 4cad4989..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-FreeBSD_task:
-  matrix:
-    env:
-      SSL: libressl
-  matrix:
-    freebsd_instance:
-      image_family: freebsd-14-3
-  prepare_script:
-    - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr libxkbfile nasm fusefs-libs3 check imlib2 freetype2 cmocka ibus
-    - git submodule update --init --recursive
-  configure_script:
-    - ./bootstrap
-    - env CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ibus --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman --enable-fuse --with-imlib2 --with-freetype2
-  build_script:
-    - make -j $(sysctl -n hw.ncpu || echo 4)
-  check_script:
-    - make check
-  install_script:
-    - make install
-  test_script:
-    - /usr/local/sbin/xrdp -v
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d8bd9405..b0af870a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -247,3 +247,36 @@ jobs:
         run: scripts/run_astyle.sh -v $ASTYLE_VER
       - name: Check code formatting
         run: git diff --exit-code
+
+  build_on_freebsd:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        freebsd-version: ["15.0", "14.4"]
+        ssl: ["", "libressl"]
+    name: FreeBSD ${{ matrix.freebsd-version }} Build with ${{ matrix.ssl || 'base openssl' }}
+    env:
+      CPPFLAGS: "-I/usr/local/include"
+      LDFLAGS: "-L/usr/local/lib "
+      SSL: ${{ matrix.ssl }}
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v6
+      with:
+        submodules: recursive
+    - name: test run
+      uses: vmactions/freebsd-vm@v1
+      with:
+        release: ${{ matrix.freebsd-version }}
+        envs: 'CPPFLAGS LDFLAGS SSL'
+        prepare: |
+          pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr libxkbfile nasm fusefs-libs3 check imlib2 freetype2 cmocka ibus
+        run: |
+          ./bootstrap
+          ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ibus --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman --enable-fuse --with-imlib2 --with-freetype2
+          make -j $(nproc || echo 4)
+          make check
+          make install
+          /usr/local/sbin/xrdp -v
+