diff --git a/bash_scripts/docker-ubuntu-install.sh b/bash_scripts/docker-ubuntu-install.sh
index ebeb58f..768511a 100755
--- a/bash_scripts/docker-ubuntu-install.sh
+++ b/bash_scripts/docker-ubuntu-install.sh
@@ -1,22 +1,16 @@
 set -e
 
 sudo apt-get update
-sudo apt-get install --assume-yes \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    gnupg \
-    lsb-release \
-    software-properties-common \
-    vim
-
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo apt-key fingerprint 0EBFCD88
-
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+sudo apt-get install --assume-yes ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
 
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt-get update
-sudo apt-get install --assume-yes docker-ce docker-ce-cli containerd.io docker-compose-plugin
 
-apt-get install --assume-yes python3-pip docker-compose
+sudo apt-get install  --assume-yes docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin