diff --git a/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh b/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh
index afc23dd3b5a74a025008f7fd9adb49aad8d0cc25..6b8d088649f20526e79688fff5d403326a7b4924 100755
--- a/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh
+++ b/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh
@@ -24,12 +24,11 @@ sudo iptables -P FORWARD ACCEPT
 
 ## Install docker and docker-compose
 sudo rm /etc/apt/sources.list.d/docker.list*
-sudo mkdir -p /etc/apt/keyrings -y
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(. /etc/os-release; echo "$UBUNTU_CODENAME") stable"
-sudo chmod a+r /etc/apt/keyrings/docker.gpg -y
-sudo apt-get update -y
-sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y
+sudo mkdir -p /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
 sudo curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose