diff --git a/completion.d/aptly b/completion.d/aptly
index dd2e8040..8caf47f8 100644
--- a/completion.d/aptly
+++ b/completion.d/aptly
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # (The MIT License)
 #
 # Copyright (c) 2014 Andrey Smirnov
diff --git a/debian/aptly.bash-completion b/debian/aptly.bash-completion
deleted file mode 100644
index 9cfd752f..00000000
--- a/debian/aptly.bash-completion
+++ /dev/null
@@ -1,576 +0,0 @@
-#!/bin/bash
-
-# (The MIT License)
-#
-# Copyright (c) 2014 Andrey Smirnov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-__aptly_mirror_list()
-{
-  aptly mirror list -raw
-}
-
-__aptly_repo_list()
-{
-  aptly repo list -raw
-}
-
-__aptly_snapshot_list()
-{
-  aptly snapshot list -raw
-}
-
-__aptly_published_distributions()
-{
-  aptly publish list -raw | cut -d ' ' -f 2 | sort | uniq
-}
-
-__aptly_published_prefixes()
-{
-  aptly publish list -raw | cut -d ' ' -f 1 | sort | uniq
-}
-
-__aptly_prefixes_for_distribution()
-{
-  aptly publish list -raw | awk -v dist="$1" '{ if (dist == $2) print $1 }' | sort | uniq
-}
-
-_aptly()
-{
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    commands="api config db graph mirror package publish repo serve snapshot task version"
-    options="-architectures= -config= -dep-follow-all-variants -dep-follow-recommends -dep-follow-source -dep-follow-suggests"
-
-    db_subcommands="cleanup recover"
-    mirror_subcommands="create drop show list rename search update"
-    publish_subcommands="drop list repo snapshot switch update"
-    snapshot_subcommands="create diff drop filter list merge pull rename search show verify"
-    repo_subcommands="add copy create drop edit import list move remove rename search show"
-    package_subcommands="search show"
-    task_subcommands="run"
-    config_subcommands="show"
-    api_subcommands="serve"
-
-    local cmd subcmd numargs numoptions i
-
-    numargs=0
-    numoptions=0
-
-    for (( i=1; i < $COMP_CWORD; i++ )); do
-      if [[ -n "$cmd" ]]; then
-        if [[ ! -n "$subcmd" ]]; then
-          subcmd=${COMP_WORDS[i]}
-          numargs=$(( COMP_CWORD - i - 1 ))
-        else
-          if [[ "${COMP_WORDS[i]}" == -* ]]; then
-            numoptions=$(( numoptions + 1 ))
-            numargs=$(( numargs - 1 ))
-          fi
-        fi
-      else
-        if [[ ! "${COMP_WORDS[i]}" == -* ]]; then
-          cmd=${COMP_WORDS[i]}
-        fi
-      fi
-    done
-
-    if [[ ! -n "$cmd" ]];
-    then
-      case "$cur" in
-            -*)
-              COMPREPLY=($(compgen -W "${options}" -- ${cur}))
-              return 0
-            ;;
-            *)
-              COMPREPLY=($(compgen -W "${commands}" -- ${cur}))
-              return 0
-            ;;
-        esac
-    fi
-
-    if [[ ! -n "$subcmd" ]];
-    then
-        case "$prev" in
-            "db")
-              COMPREPLY=($(compgen -W "${db_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "mirror")
-              COMPREPLY=($(compgen -W "${mirror_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "repo")
-              COMPREPLY=($(compgen -W "${repo_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "snapshot")
-              COMPREPLY=($(compgen -W "${snapshot_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "publish")
-              COMPREPLY=($(compgen -W "${publish_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "package")
-              COMPREPLY=($(compgen -W "${package_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "task")
-              COMPREPLY=($(compgen -W "${task_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "config")
-              COMPREPLY=($(compgen -W "${config_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            "api")
-              COMPREPLY=($(compgen -W "${api_subcommands}" -- ${cur}))
-              return 0
-            ;;
-            *)
-            ;;
-        esac
-    fi
-
-    case "$cmd" in
-      "mirror")
-        case "$subcmd" in
-          "create")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-filter= -filter-with-deps -force-components -ignore-signatures -keyring= -with-sources -with-udebs" -- ${cur}))
-                return 0
-              fi
-            fi
-          ;;
-          "edit")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-filter= -filter-with-deps -with-sources -with-udebs" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "show")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-packages" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "search")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-deps" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "rename")
-            if [[ $numargs -eq 0 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "drop")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-force" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "list")
-            if [[ $numargs -eq 0 ]]; then
-                COMPREPLY=($(compgen -W "-raw" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "update")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-force -download-limit= -ignore-checksums -ignore-signatures -keyring=" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-        esac
-      ;;
-      "repo")
-        case "$subcmd" in
-          "add")
-            case $numargs in
-              0)
-                if [[ "$cur" == -* ]]; then
-                  COMPREPLY=($(compgen -W "-force-replace -remove-files" -- ${cur}))
-                else
-                  COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-                fi
-                return 0
-              ;;
-              1)
-                local files=$(find . -mindepth 1 -maxdepth 1  \( -type d -or -name \*.deb -or -name \*.dsc \) -exec basename {} \;)
-                COMPREPLY=($(compgen -W "${files}" -- ${cur}))
-                return 0
-              ;;
-            esac
-          ;;
-          "copy"|"move")
-            case $numargs in
-              0)
-                if [[ "$cur" == -* ]]; then
-                  COMPREPLY=($(compgen -W "-with-deps -dry-run" -- ${cur}))
-                else
-                  COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-                fi
-                return 0
-              ;;
-              1)
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-                return 0
-              ;;
-            esac
-          ;;
-          "create")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-comment= -distribution= -component=" -- ${cur}))
-                return 0
-              fi
-            fi
-          ;;
-          "drop")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-force" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "edit")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-comment= -distribution= -component=" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "search")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-deps" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "list")
-            if [[ $numargs -eq 0 ]]; then
-                COMPREPLY=($(compgen -W "-raw" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "import")
-            case $numargs in
-              0)
-                if [[ "$cur" == -* ]]; then
-                  COMPREPLY=($(compgen -W "-with-deps -dry-run" -- ${cur}))
-                else
-                  COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-                fi
-                return 0
-              ;;
-              1)
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-                return 0
-              ;;
-            esac
-          ;;
-          "remove")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-dry-run" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "show")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-packages" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "rename")
-            if [[ $numargs -eq 0 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-        esac
-      ;;
-      "snapshot")
-        case "$subcmd" in
-          "create")
-            case $numargs in
-              1)
-                COMPREPLY=($(compgen -W "from empty" -- ${cur}))
-                return 0
-              ;;
-              2)
-                if [[ "$prev" == "from" ]]; then
-                  COMPREPLY=($(compgen -W "mirror repo" -- ${cur}))
-                  return 0
-                fi
-              ;;
-              3)
-                if [[ "$prev" == "mirror" ]]; then
-                  COMPREPLY=($(compgen -W "$(__aptly_mirror_list)" -- ${cur}))
-                  return 0
-                fi
-                if [[ "$prev" == "repo" ]]; then
-                  COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-                  return 0
-                fi
-              ;;
-            esac
-          ;;
-          "diff")
-            if [[ $numargs -eq 0 ]] && [[ "$cur" == -* ]]; then
-              COMPREPLY=($(compgen -W "-only-matching" -- ${cur}))
-              return 0
-            fi
-
-            if [[ $numargs -lt 2 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "drop")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-force" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "list")
-            if [[ $numargs -eq 0 ]]; then
-                COMPREPLY=($(compgen -W "-raw -sort=" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "merge")
-            if [[ $numargs -gt 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-latest" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "pull")
-            if [[ $numargs -eq 0 ]] && [[ "$cur" == -* ]]; then
-              COMPREPLY=($(compgen -W "-all-matches -dry-run -no-deps -no-remove" -- ${cur}))
-              return 0
-            fi
-
-            if [[ $numargs -lt 2 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "filter")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-deps" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "show")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-packages" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "search")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-deps" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-          "rename")
-            if [[ $numargs -eq 0 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "verify")
-            if [[ $numargs -eq 0 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-        esac
-      ;;
-      "publish")
-        case "$subcmd" in
-          "snapshot"|"repo")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-batch -force-overwrite -distribution= -component= -gpg-key= -keyring= -label= -origin= -passphrase= -passphrase-file= -secret-keyring= -skip-signing" -- ${cur}))
-              else
-                if [[ "$subcmd" == "snapshot" ]]; then
-                  COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-                else
-                  COMPREPLY=($(compgen -W "$(__aptly_repo_list)" -- ${cur}))
-                fi
-              fi
-              return 0
-            fi
-
-            if [[ $numargs -eq 1 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_published_prefixes)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "list")
-            if [[ $numargs -eq 0 ]]; then
-                COMPREPLY=($(compgen -W "-raw" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "update")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-batch -force-overwrite -gpg-key= -keyring= -passphrase= -passphrase-file= -secret-keyring= -skip-signing" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_published_distributions)" -- ${cur}))
-              fi
-              return 0
-            fi
-
-            if [[ $numargs -eq 1 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_prefixes_for_distribution $prev)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "switch")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-batch -force-overwrite -component= -gpg-key= -keyring= -passphrase= -passphrase-file= -secret-keyring= -skip-signing" -- ${cur}))
-              else
-                COMPREPLY=($(compgen -W "$(__aptly_published_distributions)" -- ${cur}))
-              fi
-              return 0
-            fi
-
-            if [[ $numargs -eq 1 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_prefixes_for_distribution $prev)" -- ${cur}))
-              return 0
-            fi
-
-            if [[ $numargs -ge 2 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
-              return 0
-            fi
-          ;;
-          "drop")
-            if [[ $numargs -eq 0 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_published_distributions)" -- ${cur}))
-              return 0
-            fi
-
-            if [[ $numargs -eq 1 ]]; then
-              COMPREPLY=($(compgen -W "$(__aptly_prefixes_for_distribution $prev)" -- ${cur}))
-              return 0
-            fi
-          ;;
-        esac
-      ;;
-      "package")
-        case "$subcmd" in
-          "show")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-with-files -with-references" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-        esac
-      ;;
-      "serve")
-        if [[ "$cur" == -* ]]; then
-          COMPREPLY=($(compgen -W "-listen=" -- ${cur}))
-          return 0
-        fi
-      ;;
-      "api")
-        case "$subcmd" in
-          "serve")
-            if [[ $numargs -eq 0 ]]; then
-              if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-listen=" -- ${cur}))
-              fi
-              return 0
-            fi
-          ;;
-        esac
-      ;;
-    esac
-} && complete -F _aptly aptly
diff --git a/debian/aptly.install b/debian/aptly.install
index 37ed8711..777b94c9 100644
--- a/debian/aptly.install
+++ b/debian/aptly.install
@@ -3,3 +3,4 @@ README.rst usr/share/aptly/
 LICENSE usr/share/aptly/
 AUTHORS usr/share/aptly/
 completion.d/_aptly usr/share/zsh/vendor-completions/
+completion.d/aptly usr/share/bash-completion/completions/
diff --git a/debian/control b/debian/control
index 9b673e93..eeb0b996 100644
--- a/debian/control
+++ b/debian/control
@@ -8,40 +8,75 @@ Build-Depends: debhelper (>= 11),
                golang-go,
                golang-github-aleksi-pointer-dev,
                golang-github-awalterschulze-gographviz-dev,
-               golang-github-aws-aws-sdk-go-dev,
-               golang-github-disposaboy-jsonconfigreader-dev,
-               golang-github-gin-gonic-gin-dev,
-               golang-github-kjk-lzma-dev,
-               golang-github-mattn-go-shellwords-dev,
-               golang-github-mkrautz-goar-dev,
-               golang-github-mxk-go-flowrate-dev,
-               golang-github-ncw-swift-dev,
-               golang-github-pkg-errors-dev,
-               golang-github-smira-commander-dev,
-               golang-github-smira-flag-dev,
-               golang-github-smira-go-aws-auth-dev,
-               golang-github-smira-go-ftp-protocol-dev,
-               golang-github-smira-go-xz-dev (>> 0.0~git20150414.0c531f0-2.1),
-               golang-github-ugorji-go-codec-dev (>> 1.1.7-2),
-               golang-github-wsxiaoys-terminal-dev,
-               golang-golang-x-crypto-dev,
-               golang-golang-x-sys-dev,
-               golang-github-syndtr-goleveldb-dev,
-               golang-gopkg-check.v1-dev,
-               golang-gopkg-cheggaaa-pb.v1-dev,
-               golang-gopkg-h2non-filetype.v1-dev,
-               golang-uuid-dev,
-               golang-github-cavaliergopher-grab-dev,
-               golang-golang-x-time-dev,
+               golang-github-aws-aws-sdk-go-v2-dev,
+               golang-github-aws-smithy-go-dev,
+               golang-github-azure-azure-pipeline-go-dev,
                golang-github-azure-azure-storage-blob-go-dev,
+               golang-github-beorn7-perks-dev,
+               golang-github-cavaliergopher-grab-dev,
+               golang-github-cespare-xxhash-dev,
+               golang-github-cheggaaa-pb.v3-dev,
+               golang-github-cloudflare-circl-dev,
+               golang-github-coreos-go-semver-dev,
+               golang-github-coreos-go-systemd-dev,
+               golang-github-disposaboy-jsonconfigreader-dev,
+               golang-github-gin-contrib-sse-dev,
+               golang-github-gin-gonic-gin-dev,
+               golang-github-gogo-protobuf-dev,
+               golang-snappy-go-dev,
+               golang-github-google-uuid-dev,
+               golang-github-go-playground-locales-dev,
+               golang-github-go-playground-universal-translator-dev,
+               golang-github-go-playground-validator-v10-dev,
+               golang-gopkg-h2non-filetype.v1-dev,
+               golang-github-hashicorp-errwrap-dev,
+               golang-github-hashicorp-go-multierror-dev,
+               golang-github-jlaffaye-ftp-dev,
+               golang-github-kjk-lzma-dev,
                golang-github-klauspost-compress-dev,
                golang-github-klauspost-pgzip-dev,
-#               golang-github-prometheus-client-golang-dev,
-               golang-github-rs-zerolog-dev (>= 1.28.0),
+               golang-github-leodido-go-urn-dev,
                golang-github-mattn-go-colorable-dev,
-               golang-github-aws-aws-sdk-go-v2-dev,
+               golang-github-mattn-go-ieproxy-dev,
+               golang-github-mattn-go-isatty-dev,
+               golang-github-mattn-go-runewidth-dev,
+               golang-github-mattn-go-shellwords-dev,
+               golang-github-mkrautz-goar-dev,
+               golang-github-munnerz-goautoneg-dev,
+               golang-github-mxk-go-flowrate-dev,
+               golang-github-ncw-swift-dev,
+               golang-github-pborman-uuid-dev,
+               golang-github-pelletier-go-toml,
+               golang-github-pkg-errors-dev,
+               golang-github-prometheus-client-golang-dev,
+               golang-github-prometheus-client-model-dev,
+               golang-github-prometheus-common-dev,
+               golang-github-prometheus-procfs-dev,
                golang-github-protonmail-go-crypto-dev,
+               golang-github-rivo-uniseg-dev,
+               golang-github-rs-zerolog-dev,
                golang-github-saracen-walker-dev,
+               golang-github-smira-commander-dev,
+               golang-github-smira-flag-dev,
+               golang-github-smira-go-ftp-protocol-dev,
+               golang-github-smira-go-xz-dev,
+               golang-github-syndtr-goleveldb-dev,
+               golang-github-ugorji-go-codec,
+               golang-github-wsxiaoys-terminal-dev,
+               golang-golang-x-crypto-dev,
+               golang-golang-x-net-dev,
+               golang-golang-x-sync-dev,
+               golang-golang-x-sys-dev,
+               golang-golang-x-term-dev,
+               golang-golang-x-text-dev,
+               golang-golang-x-time-dev,
+               golang-google-genproto-dev,
+               golang-google-grpc-dev,
+               golang-google-protobuf-dev,
+               golang-gopkg-yaml.v2-dev,
+               golang-go.uber-multierr-dev,
+               golang-go.uber-zap-dev,
+               golang-etcd-server-dev (>= 3.5.15-7),
                git
 Standards-Version: 4.2.1
 Homepage: https://github.com/aptly-dev/aptly
@@ -53,17 +88,19 @@ Testsuite: autopkgtest-pkg-go
 Package: aptly
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, adduser
+Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
 Description: Debian repository management tool
  aptly is a Swiss army knife for Debian repository management.
 
 Package: aptly-dbg
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}
+Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
 Description: Debian repository management tool (debug files)
  Debug symbols for aptly
 
 Package: aptly-api
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}, aptly
+Depends: ${misc:Depends}, aptly
 Description: Debian repository management tool (REST API server)
  systemd service and configuration for aptly
diff --git a/debian/rules b/debian/rules
index 54949cbf..1b4dddd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,10 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	dh_auto_install -- --no-source
-	mkdir -p debian/aptly/usr/share/man/man1/ debian/aptly/usr/share/bash-completion/completions/
+	mkdir -p build
+	test -f debian/tmp/usr/bin/aptly && mv debian/tmp/usr/bin/aptly build/ || true
+	mkdir -p debian/aptly/usr/share/man/man1/
 	cp man/aptly.1 debian/aptly/usr/share/man/man1
-	cp completion.d/aptly debian/aptly/usr/share/bash-completion/completions/
 	gzip debian/aptly/usr/share/man/man1/aptly.1
 
 override_dh_strip:
diff --git a/system/build-deb b/system/build-deb
index 3e049660..d161f3bf 100755
--- a/system/build-deb
+++ b/system/build-deb
@@ -3,16 +3,13 @@
 usermod -u `stat -c %u /work/src` aptly >/dev/null
 chown -R `stat -c %u /work/src` /var/lib/aptly
 
-
 su aptly -c 'set -e; cd /work/src;
 GOPATH=$PWD/.go go generate -v
 git checkout debian/changelog
 DEBEMAIL="CI <runner@github>" dch -v `make version` "CI build"
-dpkg-buildpackage -us -uc -b -d --host-arch=amd64
-dpkg-buildpackage -us -uc -b -d --host-arch=i386
-dpkg-buildpackage -us -uc -b -d --host-arch=arm64
-dpkg-buildpackage -us -uc -b -d --host-arch=armhf
+dpkg-buildpackage -us -uc -b -d
 mkdir -p build && mv ../*.deb build/
 rm -rf obj-*-linux-gnu*
+git checkout debian/changelog
 cd build && ls -l *.deb
 '