diff --git a/.build/software/dietpi-software-build.bash b/.build/software/dietpi-software-build.bash
index b29492cb9c..818a42a8de 100644
--- a/.build/software/dietpi-software-build.bash
+++ b/.build/software/dietpi-software-build.bash
@@ -138,6 +138,36 @@ mkdir -v /output && mv -v /tmp/*.$EXT /output
 poweroff
 _EOF_
 
+##########################################
+# bash-script for building unbound-package
+##########################################
+	
+UNBOUND_VERSION="1.19.2-1"
+DEBIAN_VERSION=$DISTRO
+ARCHITECTURE=$ARCH
+
+if [ -z "$DEBIAN_VERSION" ] || [ -z "$ARCHITECTURE" ]; then
+	echo "Usage: $0 <debian-version> <architecture>"
+	exit 1
+fi
+
+# install dependencies
+G_EXEC sudo apt-get update
+G_EXEC sudo apt-get install -y debhelper devscripts
+
+# clone Unbound source
+G_EXEC git clone --branch debian/$UNBOUND_VERSION --depth=1 https://salsa.debian.org/dns-team/unbound.git
+G_EXEC cd unbound
+
+# add new changelog-entry
+G_EXEC dch -l "+dietpi" "Neuer DietPi Build für $DEBIAN_VERSION und $ARCHITECTURE."
+
+# build package for specific architecture
+G_EXEC dpkg-buildpackage -us -uc -b -a$ARCHITECTURE
+
+# move package
+G_EXEC mv ../*.deb ~/dietpi-packages/
+
 ##########################################
 # Boot container
 ##########################################
diff --git a/.github/workflows/dietpi-software-build.yml b/.github/workflows/dietpi-software-build.yml
index 0570711301..5f83c58be3 100644
--- a/.github/workflows/dietpi-software-build.yml
+++ b/.github/workflows/dietpi-software-build.yml
@@ -74,9 +74,19 @@ jobs:
     name: "${{ matrix.name }} - ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
     steps:
-    - name: Build
-      run: sudo bash -c "G_GITOWNER=$GITHUB_REPOSITORY_OWNER G_GITBRANCH=$GITHUB_REF_NAME; $(curl -sSf "https://raw.githubusercontent.com/$GITHUB_REPOSITORY_OWNER/DietPi/$GITHUB_REF_NAME/.build/software/dietpi-software-build.bash")" -- -n '${{ matrix.name }}' -a '${{ matrix.arch }}' -d '${{ matrix.dist }}'
-    - name: Upload
+    - name: Checkout Code
+      uses: actions/checkout@v2
+    - name: Cache Dependencies
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cache/debhelper
+          ~/.cache/devscripts
+        key: ${{ runner.os }}-debhelper-${{ hashFiles('**/control') }}
+    - name: Build Unbound Package
+      run: |
+        bash ./dietpi-software-build-unbound.sh ${{ matrix.dist }} ${{ matrix.arch }}
+    - name: Upload Package
       run: |
         # SSH server and client keys
         mkdir ~/.ssh