diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 11bc11d..bb56827 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -55,8 +55,8 @@ jobs:
 
       - name: Generate Packages List
         run: |
-          packages="$(cat common-packages | tr '\n' ' ')"
-          packages+=" $(cat "${{ matrix.distro }}/${{ matrix.codename }}/additional-packages" | tr '\n' ' ')"
+          packages="$(cat common-packages | grep -v "#" | tr '\n' ' ')"
+          packages+=" $(cat "${{ matrix.distro }}/${{ matrix.codename }}/additional-packages" | grep -v "#" | tr '\n' ' ')"
           echo "packages=$packages" >> $GITHUB_ENV
 
       - name: Build & Push ci-${{ matrix.distro }}:${{ matrix.codename }}-${{ matrix.arch }} Image
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 895f4f3..8c428e9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,8 +42,8 @@ jobs:
 
       - name: Generate Packages List
         run: |
-          packages="$(cat common-packages | tr '\n' ' ')"
-          packages+=" $(cat "${{ matrix.distro }}/${{ matrix.codename }}/additional-packages" | tr '\n' ' ')"
+          packages="$(cat common-packages | grep -v "#" | tr '\n' ' ')"
+          packages+=" $(cat "${{ matrix.distro }}/${{ matrix.codename }}/additional-packages" | grep -v "#" | tr '\n' ' ')"
           echo "packages=$packages" >> $GITHUB_ENV
 
       - name: Build ci-${{ matrix.distro }}:${{ matrix.codename }}-${{ matrix.arch }} Image
diff --git a/common-packages b/common-packages
index 8d19d2e..969f2fc 100644
--- a/common-packages
+++ b/common-packages
@@ -1,13 +1,22 @@
+# sudo
 sudo
+
+# git related packages
 git
+git-buildpackage
 ca-certificates
+
+# useful tools
 wget
 curl
 jq
+
+# gpg packages
 gpg
 gpg-agent
+
+# packages required for building .deb package
 devscripts
 dput
 diffutils
 packaging-dev
-git-buildpackage
diff --git a/debian/testing/additional-packages b/debian/testing/additional-packages
index e69de29..3f5715d 100644
--- a/debian/testing/additional-packages
+++ b/debian/testing/additional-packages
@@ -0,0 +1 @@
+systemd-dev
diff --git a/ubuntu/oracular/additional-packages b/ubuntu/oracular/additional-packages
index e69de29..3f5715d 100644
--- a/ubuntu/oracular/additional-packages
+++ b/ubuntu/oracular/additional-packages
@@ -0,0 +1 @@
+systemd-dev