diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 4d11655..9dc56c5 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -111,10 +111,11 @@ stages:
               - bash: |
                   set -ex
                   /tmp/docker exec -t -u 0 ci-container \
-                    sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::='--force-confold' -y install sudo software-properties-common g++ python"
+                    sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::='--force-confold' -y install sudo software-properties-common"
                   # Need (newer) git
                   sudo add-apt-repository ppa:git-core/ppa
-                  sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git
+                  sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+                  sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git
                 displayName: 'Install required sw for containers'
             - bash: |
                 set -ex
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c23905..125201c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,10 +91,11 @@ jobs:
             fi
             if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
                 apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common build-essential g++ python libpython-dev
-                # Need newer git
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common
+                # Need (newer) git
                 add-apt-repository ppa:git-core/ppa
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git
             fi
             git config --global pack.threads 0