diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml
index 75d9b71..92aec66 100644
--- a/.forgejo/workflows/docker-publish.yml
+++ b/.forgejo/workflows/docker-publish.yml
@@ -28,24 +28,19 @@ jobs:
 
       - name: Install Docker Client CLI
         run: |
-          echo "Updating package list..."
-          apt-get update -y
-          echo "Installing prerequisites..."
-          apt-get install -y --no-install-recommends \
-             apt-transport-https \
-             ca-certificates \
-             curl \
-             gnupg \
-             lsb-release
-          echo "Adding Docker GPG key..."
-          mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          echo "Setting up Docker repository..."
+          # Add Docker's official GPG key:
+          apt-get update
+          apt-get install ca-certificates curl
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+          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.gpg] https://download.docker.com/linux/ubuntu \
-            $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-          echo "Updating package list again..."
-          apt-get update -y
+          "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+          $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
+          tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
           echo "Installing docker-ce-cli..."
           apt-get install -y docker-ce-cli # Install only the client package
           echo "Verifying docker client..."