diff --git a/.github/workflows/deb-buildd.yml b/.github/workflows/deb-buildd.yml
index 438696e3..08bbb57a 100644
--- a/.github/workflows/deb-buildd.yml
+++ b/.github/workflows/deb-buildd.yml
@@ -144,8 +144,9 @@ jobs:
           #\$host_arch = '${{ inputs.arch }}';
           \$chroot_mode = 'unshare';
           \$unshare_tmpdir_template = '/tmp/tmp.sbuild.XXXXXXXXXX';
-          EOT
-          tee -a ~/.sbuildrc > /dev/null <<EOT
+          \$run_lintian = 1;
+          \$run_piuparts = 0;
+          \$run_autopkgtest = 0;
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
             '--variant=apt'
           ];
@@ -162,13 +163,22 @@ jobs:
           else
           exit 1
           fi
+          if [ "${{ inputs.dist-name }}" = "debian" ];
+          then
+          KEYRING="/usr/share/keyrings/debian-keyring.gpg"
+          elif [ "${{ inputs.dist-name }}" = "ubuntu" ];
+          then
+          KEYRING="/usr/share/keyrings/ubuntu-archive-keyring.gpg"
+          else
+          exit 1
+          fi
           echo "MIRROR=$(echo ${MIRROR})" >> $GITHUB_ENV
           if [ "${{ inputs.dist-name }}" = "debian" ];
           then
           tee -a ~/.sbuildrc > /dev/null <<EOT
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
             '$MIRROR',
-            '--keyring=/usr/share/keyrings/debian-keyring.gpg',
+            '--keyring=$KEYRING',
             '--components=main'
           ];
           EOT
@@ -187,7 +197,7 @@ jobs:
           tee -a ~/.sbuildrc > /dev/null <<EOT
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
             '$MIRROR',
-            '--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg',
+            '--keyring=$KEYRING',
             '--components=main,universe'
           ];
           \$extra_repositories = [