diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
index 817ce348705d..58e4fb955c81 100644
--- a/.github/workflows/_docker-build.yml
+++ b/.github/workflows/_docker-build.yml
@@ -3,7 +3,7 @@ name: Reusable docker server image build workflow
 on:
   workflow_call:
     inputs:
-      namespace_repository:
+      namespace-repository:
         description: "The namespace and repository in the following format `namespace/repository` e.g. (flwr/base)."
         required: true
         type: string
diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml
index bddc70385212..1b01350e751c 100644
--- a/.github/workflows/docker-base.yml
+++ b/.github/workflows/docker-base.yml
@@ -1,9 +1,10 @@
 name: Build docker base image
 
 on:
-  push:
-    # paths:
-    #   - src/docker/base
+  workflow_dispatch
+  # push:
+  #   paths:
+  #     - src/docker/base/*
 
 permissions:
   contents: read
@@ -40,7 +41,7 @@ jobs:
       matrix:
         python-version: [3.11]
     with:
-      namespace_repository: flwr/base
+      namespace-repository: flwr/base
       file: src/docker/base
       build-args: |
         PYTHON_VERSION=${{ matrix.python-version }}
diff --git a/.github/workflows/docker-server.yml b/.github/workflows/docker-server.yml
index 3e351c6e9b43..4f4eecb30b73 100644
--- a/.github/workflows/docker-server.yml
+++ b/.github/workflows/docker-server.yml
@@ -11,7 +11,7 @@ on:
         description: "Version of Flower base image."
         required: false
         type: string
-        default: "22.04"
+        default: "py3.11-ubuntu22.04"
 
 permissions:
   contents: read
@@ -20,7 +20,7 @@ jobs:
   build-server-images:
     uses: ./.github/workflows/_docker-build.yml
     with:
-      namespace_repository: flwr/server
+      namespace-repository: flwr/server
       file: src/docker/server
       build-args: |
         FLWR_VERSION=${{ github.event.inputs.flwr-version }}
diff --git a/src/docker/server/Dockerfile b/src/docker/server/Dockerfile
index a20864e7d7bf..72d7dd595639 100644
--- a/src/docker/server/Dockerfile
+++ b/src/docker/server/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright 2023 Flower Labs GmbH. All Rights Reserved.
 
-ARG BASE_IMAGE_VERSION=22.04
+ARG BASE_IMAGE_VERSION=py3.11-ubuntu22.04
 FROM flwr/base:$BASE_IMAGE_VERSION
 
 WORKDIR /app
@@ -9,5 +9,5 @@ RUN python -m pip install -U --no-cache-dir flwr[rest]==${FLWR_VERSION}
 ENTRYPOINT ["python", "-c", "from flwr.server import run_server; run_server()"]
 
 # Test if Flower can be successfully installed and imported
-FROM flwr/base:$BASE_VERSION
+FROM flwr/base:$BASE_IMAGE_VERSION
 RUN python -c "from flwr.server import run_server"