diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 867cca9d037..0d81a7b303c 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -470,7 +470,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-server --image-path docker/server
-          python3 docker_server.py --release-type head --no-push --no-ubuntu \
+          python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 7c5e477ab60..b1ea1641a02 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -862,7 +862,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 docker_server.py --release-type head \
             --image-repo clickhouse/clickhouse-server --image-path docker/server
-          python3 docker_server.py --release-type head --no-ubuntu \
+          python3 docker_server.py --release-type head \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 2f2c263df37..ab0cbbb7ec1 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -918,7 +918,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-server --image-path docker/server
-          python3 docker_server.py --release-type head --no-push --no-ubuntu \
+          python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 73246af6dfc..0742ebfd449 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
         cd "$GITHUB_WORKSPACE/tests/ci"
         python3 docker_server.py --release-type auto --version "$GITHUB_TAG" \
           --image-repo clickhouse/clickhouse-server --image-path docker/server
-        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" --no-ubuntu \
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" \
           --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
     - name: Cleanup
       if: always()
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index e56a1fb58fc..1282dbef50b 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -527,7 +527,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-server --image-path docker/server
-          python3 docker_server.py --release-type head --no-push --no-ubuntu \
+          python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index 34c1406b687..6496a2b2a12 100644
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@@ -1,3 +1,6 @@
+# The Dockerfile.ubuntu exists for the tests/ci/docker_server.py script
+# If the image is built from Dockerfile.alpine, then the `-alpine` suffix is added automatically,
+# so the only purpose of Dockerfile.ubuntu is to push `latest`, `head` and so on w/o suffixes
 FROM ubuntu:20.04 AS glibc-donor
 
 ARG TARGETARCH
diff --git a/docker/keeper/Dockerfile.ubuntu b/docker/keeper/Dockerfile.ubuntu
new file mode 120000
index 00000000000..1d1fe94df49
--- /dev/null
+++ b/docker/keeper/Dockerfile.ubuntu
@@ -0,0 +1 @@
+Dockerfile
\ No newline at end of file