diff --git a/README.md b/README.md
index ea2ad9e53..9c7b4700a 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,7 @@ The following table describes which branches are tested for different test trigg
 | test suffix | CAPM3 branch | IPAM branch  | BMO branch/tag  | Keepalived tag | Ironic tag |
 | ----------- | ------------ | -----------  | --------------- | -------------- | ---------- |
 | main        | main         | main         | main            | latest         | latest     |
+| release-1-8 | release-1.8  | release-1.8  | release-0.7     | v0.7.0         | v25.0.0    |
 | release-1-7 | release-1.7  | release-1.7  | release-0.6     | v0.6.1         | v24.1.1    |
 | release-1-6 | release-1.6  | release-1.6  | release-0.5     | v0.5.1         | v24.0.0    |
 | release-1-5 | release-1.5  | release-1.5  | release-0.4     | v0.4.2         | v23.1.0    |
diff --git a/lib/common.sh b/lib/common.sh
index 4e5ecff35..a3cb0f81e 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -164,6 +164,9 @@ elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.6" ]]; then
 elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.7" ]]; then
   export CAPM3BRANCH="${CAPM3BRANCH:-release-1.7}"
   export IPAMBRANCH="${IPAMBRANCH:-release-1.7}"
+elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.8" ]]; then
+  export CAPM3BRANCH="${CAPM3BRANCH:-release-1.8}"
+  export IPAMBRANCH="${IPAMBRANCH:-release-1.8}"
 else
   export CAPM3BRANCH="${CAPM3BRANCH:-main}"
   export IPAMBRANCH="${IPAMBRANCH:-main}"
@@ -289,6 +292,14 @@ elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]]; then
   export IRONIC_TAG="v24.1.1"
   export BMOCOMMIT="eea41f4fbcf73c5aae7e015ad552b137ae507dbb" # tag v0.6.1
   export BMOBRANCH="${BMORELEASEBRANCH:-release-0.6}"
+elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.8" ]]; then
+  export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.8"}
+  export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.8"}
+  export BARE_METAL_OPERATOR_TAG="v0.7.0"
+  export KEEPALIVED_TAG="v0.7.0"
+  export IRONIC_TAG="v25.0.0"
+  export BMOCOMMIT="eea41f4fbcf73c5aae7e015ad552b137ae507dbb" # tag v0.7.0
+  export BMOBRANCH="${BMORELEASEBRANCH:-release-0.7}"
 else
   export CAPM3_IMAGE="${CAPM3_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:main}"
   export IPAM_IMAGE="${IPAM_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:main}"
diff --git a/lib/releases.sh b/lib/releases.sh
index e4af8de2c..ad7438e97 100644
--- a/lib/releases.sh
+++ b/lib/releases.sh
@@ -81,6 +81,10 @@ elif [ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]; then
   # 1.7.99 points to the head of the release-1.7 branch. Local override for CAPM3 is created for this version.
   export CAPM3RELEASE="v1.7.99"
   export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.7.")}"
+elif [ "${CAPM3RELEASEBRANCH}" = "release-1.8" ]; then
+  # 1.8.99 points to the head of the release-1.8 branch. Local override for CAPM3 is created for this version.
+  export CAPM3RELEASE="v1.8.99"
+  export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.8.")}"
 else
   # 1.7.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
   export CAPM3RELEASE="v1.7.99"