diff --git a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh
index 7361db7359..4e74df478d 100644
--- a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh
+++ b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh
@@ -34,11 +34,16 @@ readonly erlang_cookie='${erlang_cookie}'
 readonly debian_codename="$${distribution#debian-*}"
 
 case "$erlang_version" in
-  23.*)
+  24.*)
     if test -z "$erlang_git_ref"; then
       erlang_git_ref='master'
     fi
     ;;
+  23.*)
+    if test -z "$erlang_git_ref"; then
+      erlang_git_ref='maint-23'
+    fi
+    ;;
   22.*|21.*|20.*|19.3)
     readonly erlang_package_version="1:$erlang_version-1"
     ;;
@@ -213,7 +218,7 @@ install_kiex() {
 
 kiex_install_elixir() {
   case "$erlang_version" in
-    22.*|23.*)
+    22.*|23.*|24.*)
       url="https://github.com/elixir-lang/elixir/releases/download/v$elixir_version/Precompiled.zip"
       wget -q -O/tmp/elixir.zip "$url"
 
diff --git a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/variables.tf b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/variables.tf
index b7cd8c196d..04f89bd37d 100644
--- a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/variables.tf
+++ b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/variables.tf
@@ -103,6 +103,7 @@ variable "erlang_version_to_system" {
     "23.1"   = "debian-stretch"
     "23.2"   = "debian-stretch"
     "23.3"   = "debian-stretch"
+    "24.0"   = "debian-stretch"
   }
 }