diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
deleted file mode 100644
index efb3ed5..0000000
--- a/.github/workflows/makefile.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Makefile CI
-
-on:
-  push:
-    branches: ["master"]
-  pull_request:
-    branches: ["master"]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4.1.1
-
-      - name: Shellcheck
-        run: cd src/dsm7; make shellcheck
-
-      - name: Test packaging of x86_64
-        run: cd src/dsm7; ARCH=x86_64 make build
-
-      - name: Test packaging
-        run: cd src/dsm7; make build-all
-
-      - name: Cleanup target
-        run: cd src/dsm7; make clean
-
-      - name: Cleanup dist
-        run: cd src/dsm7; make clean-dist
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 069ebc4..98b64e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,8 +1,9 @@
-name: Download and Unzip latest AirConnect Release
+name: Download, unzip, test & package latest AirConnect release
 on:
   push:
-    branches:
-      - ci
+    branches: ["ci"]
+  pull_request:
+    branches: ["ci"]
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/src/dsm7/build.sh b/src/dsm7/build.sh
index 7bbc00b..f557a7a 100755
--- a/src/dsm7/build.sh
+++ b/src/dsm7/build.sh
@@ -9,6 +9,8 @@ set -eu
 ARCH_LIST="arm arm-static armv5 armv5-static armv6 armv6-static aarch64 aarch64-static x86 x86-static x86_64 x86_64-static powerpc powerpc-static"
 MAKE=$(which make)
 
+export RELEASE_VERSION="${RELEASE_VERSION}"
+
 for arch in ${ARCH_LIST}; do
   export ARCH="${arch}"
   $MAKE clean build