diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh
index 3b2853c0..83738f54 100644
--- a/images/ubuntu/scripts/build/install-docker.sh
+++ b/images/ubuntu/scripts/build/install-docker.sh
@@ -47,8 +47,14 @@ done
 # docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157
 gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }')
 groupmod -g "$gid" docker
-chgrp -hR docker /run/docker.sock
-chgrp -hR docker /var/run/docker.sock
+
+# Create systemd-tmpfiles configuration for Docker
+cat <<EOF | sudo tee /etc/tmpfiles.d/docker.conf
+L /run/docker.sock - - - - root docker 0770
+EOF
+
+# Reload systemd-tmpfiles to apply the new configuration
+systemd-tmpfiles --create /etc/tmpfiles.d/docker.conf
 
 # Enable docker.service
 systemctl is-active --quiet docker.service || systemctl start docker.service
diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1
index b5ef2250..2bd0872f 100644
--- a/images/ubuntu/scripts/tests/Tools.Tests.ps1
+++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1
@@ -69,12 +69,27 @@ Describe "Docker" {
     It "docker client" {
         $version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce-cli' } | Select-Object -ExpandProperty version
         If ($version -ne "latest") {
-            $(docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*"
+            $(sudo docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*"
         }else{
-            "docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode
+            "sudo docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode
         }
     }
 
+    It "docker server" {
+        $version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce' } | Select-Object -ExpandProperty version
+        If ($version -ne "latest") {
+            $(sudo docker version --format '{{.Server.Version}}') | Should -BeLike "*$version*"
+        }else{
+            "sudo docker version --format '{{.Server.Version}}'" | Should -ReturnZeroExitCode
+        }
+    }
+
+    It "docker client/server versions match" {
+        $clientVersion = $(sudo docker version --format '{{.Client.Version}}')
+        $serverVersion = $(sudo docker version --format '{{.Server.Version}}')
+        $clientVersion | Should -Be $serverVersion
+    }
+
     It "docker buildx" {
         $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'buildx' } | Select-Object -ExpandProperty version
         If ($version -ne "latest") {