diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba194a7..68d5fe9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -292,8 +292,11 @@ build-ubuntu-2204:
 
 build-ubuntu-2404:
   stage: build
+  variables:
+    UBUNTU_IMAGE_SUFFIX: ubuntu-24.04
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:2.16-ubuntu-24.04" -t "$DOCKER_HUB_REGISTRY_IMAGE:2.16-ubuntu-24.04" -t "$CI_REGISTRY_IMAGE:$ANSIBLE_CORE_216-ubuntu-24.04" -t "$DOCKER_HUB_REGISTRY_IMAGE:$ANSIBLE_CORE_216-ubuntu-24.04" --build-arg ANSIBLE_CORE_VERSION=${ANSIBLE_CORE_216} --build-arg ANSIBLE_VERSION=${ANSIBLE_216} --build-arg ANSIBLE_LINT=${ANSIBLE_LINT_216} ansible-core/ubuntu2404/
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:2.16-${UBUNTU_IMAGE_SUFFIX}" -t "$DOCKER_HUB_REGISTRY_IMAGE:2.16-${UBUNTU_IMAGE_SUFFIX}" -t "$CI_REGISTRY_IMAGE:$ANSIBLE_CORE_216-${UBUNTU_IMAGE_SUFFIX}" -t "$DOCKER_HUB_REGISTRY_IMAGE:$ANSIBLE_CORE_216-${UBUNTU_IMAGE_SUFFIX}" --build-arg ANSIBLE_CORE_VERSION=${ANSIBLE_CORE_216} --build-arg ANSIBLE_VERSION=${ANSIBLE_216} --build-arg ANSIBLE_LINT=${ANSIBLE_LINT_216} ansible-core/ubuntu2404/
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:2.17-${UBUNTU_IMAGE_SUFFIX}" -t "$DOCKER_HUB_REGISTRY_IMAGE:2.17-${UBUNTU_IMAGE_SUFFIX}" -t "$CI_REGISTRY_IMAGE:$ANSIBLE_CORE_217-${UBUNTU_IMAGE_SUFFIX}" -t "$DOCKER_HUB_REGISTRY_IMAGE:$ANSIBLE_CORE_217-${UBUNTU_IMAGE_SUFFIX}" --build-arg ANSIBLE_CORE_VERSION=${ANSIBLE_CORE_217} --build-arg ANSIBLE_VERSION=${ANSIBLE_217} --build-arg ANSIBLE_LINT=${ANSIBLE_LINT_217} ansible-core/ubuntu2404/
     - docker push --all-tags "$CI_REGISTRY_IMAGE"
     - docker logout
     - docker login -u "$DOCKER_HUB_USERNAME" -p "$DOCKER_HUB_PASSWORD"
diff --git a/README.md b/README.md
index 2d433cf..6783623 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ These are the latest Ansible Core versions running within the containers:
 - Ansible 2.14: 2.14.14
 - Ansible 2.15: 2.15.9
 - Ansible 2.16: 2.16.4
-- Ansible 2.17: 2.17.2
+- Ansible 2.17: 2.17.4
 - Older versions are provided within the unmaintained section, including 2.9, 2.10, 2.11 and 2.12.
 - More availablity on Ansible versions on [Ansible Release Documentation](https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html) and [Ansible-core to Python compatibility](https://pypi.org/project/ansible-core/#history).
 
@@ -47,7 +47,7 @@ This includes:
 | Bookworm Slim (Debian 12)            | [Dockerfile](https://github.com/willhallonline/docker-ansible/blob/master/ansible-core/debian-bookworm-slim/Dockerfile) |                    | `2.14-bookworm-slim` | `2.15-bookworm-slim` | `2.16-bookworm-slim` | `2.17-bookworm-slim` |
 | Rocky Linux 9                        | [Dockerfile](https://github.com/willhallonline/docker-ansible/blob/master/ansible-core/rocky9/Dockerfile)               |                    | `2.14-rockylinux-9`  | `2.15-rockylinux-9`  |                      | `2.17-rockylinux-9`  |
 | Ubuntu 22.04                         | [Dockerfile](https://github.com/willhallonline/docker-ansible/blob/master/ansible-core/ubuntu2204/Dockerfile)           |                    | `2.14-ubuntu-22.04`  | `2.15-ubuntu-22.04`  | `2.16-ubuntu-22.04`  | `2.17-ubuntu-22.04`  |
-| Ubuntu 24.04                         | [Dockerfile](https://github.com/willhallonline/docker-ansible/blob/master/ansible-core/ubuntu2404/Dockerfile)           |                    | `2.16-ubuntu-24.04`  |                      |                      |                      |
+| Ubuntu 24.04                         | [Dockerfile](https://github.com/willhallonline/docker-ansible/blob/master/ansible-core/ubuntu2404/Dockerfile)           |                    |                      |                      | `2.16-ubuntu-24.04`  | `2.17-ubuntu-24.04`  |
 
 ### ARM Releases