diff --git a/cluster-api/README.md b/cluster-api/README.md
index 4740b98..2e49d6c 100644
--- a/cluster-api/README.md
+++ b/cluster-api/README.md
@@ -24,8 +24,6 @@ This project contains the current versions of Kubernetes that the Cloud Group wi
    ansible-playbook prep_builder.yml --ask-become-pass
    ```
 
-3. Update the date in the [common_vars.json](./common_vars.json#L12) file for `image_name`
-
 ## Rate Limiting
 
 You may run into GitHub rate limiting issues when building images. To avoid this, you can set the following environment variable:
@@ -108,12 +106,16 @@ Addtionally, you will need to specify the cloud name in your session by exportin
 ## Update an image for release
 1. Check the image you are working with before you make any changes
    ```shell
-   openstack image show <image-name>
+   openstack image show <image-id>
    ```
 2. Build a cluster with the new image [here](https://stfc.atlassian.net/wiki/spaces/CLOUDKB/pages/211878034/Cluster+API+Setup) and check it builds successfully
 3. Set image to public
    ```shell
-   openstack image set --public <image-name>
+   openstack image set --public <image-id>
+   ```
+4. If this is the last supported patch version append `-eol` to the end of the image name
+   ```shell
+   openstack image set --name capi-ubuntu-2204-kube-v1.33.4-eol <image-id>
    ```
 
 ### Developer Notes
diff --git a/cluster-api/common_vars.json b/cluster-api/common_vars.json
index 57f5e8c..8881abd 100644
--- a/cluster-api/common_vars.json
+++ b/cluster-api/common_vars.json
@@ -9,6 +9,6 @@
     "image_disk_format": "",
     "floating_ip_network": "",
     "goss_inspect_mode": "true",
-    "image_name": "capi-{{user `build_name`}}-kube-{{user `kubernetes_semver`}}-YYYY-MM-DD",
+    "image_name": "capi-{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
     "image_visibility": "private"
 }
\ No newline at end of file
diff --git a/scripts/README.md b/scripts/README.md
index 6d4cedf..c92c838 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -15,4 +15,4 @@
    # Specify dev or prod OpenStack
    ./scripts/build-all.sh <env>
    ```
-3. This will build all new images and upload them to OpenStack in the form `ubuntu-2204-kube-<k8s_semver>
+3. This will build all new images and upload them to OpenStack in the form `capi-ubuntu-2204-kube-<k8s_semver>`
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index 4d18cd7..e3a3a20 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -13,12 +13,6 @@ CUSTOM_ROLE_PATH="${REPO_ROOT}/cluster-api/${env}_vars.json"
 
 # Update the image name in vars file to include date
 COMMON_VARS_PATH="${REPO_ROOT}/cluster-api/common_vars.json"
-if grep -E "YYYY-MM-DD" "${COMMON_VARS_PATH}"; then
-    sed -i -E "s/YYYY-MM-DD/$(date +%F)/" "${COMMON_VARS_PATH}"
-else
-    echo "Date not found in common_vars.json"
-    exit 1
-fi
 
 # ... and make sure Ansible knows where to find on this machine
 export ANSIBLE_ROLES_PATH="${REPO_ROOT}/os_builders/roles:${REPO_ROOT}/cluster-api/roles"