diff --git a/murano-ci/scripts/functions.inc b/murano-ci/scripts/functions.inc
index 716e2398..5b44f506 100644
--- a/murano-ci/scripts/functions.inc
+++ b/murano-ci/scripts/functions.inc
@@ -126,7 +126,11 @@ function get_floating_ip() {
         export OS_USERNAME=${ADMIN_USERNAME}
         export OS_PASSWORD=${ADMIN_PASSWORD}
         export OS_TENANT_NAME=${ADMIN_TENANT}
-        export OS_AUTH_URL="http://${OPENSTACK_HOST}:5000/v3"
+        if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
+            export OS_AUTH_URL="http://${OPENSTACK_HOST}:5000/v2.0"
+        else
+            export OS_AUTH_URL="http://${OPENSTACK_HOST}:5000/v3"
+        fi
 
         FLOATING_IP_ADDRESS=$("${tmp_venv}/bin/nova" floating-ip-list | grep " ${FOUND_IP_ADDRESS} " | cut -d ' ' -f 4)
 
diff --git a/murano-ci/scripts/prepare_tests.sh b/murano-ci/scripts/prepare_tests.sh
index d7c66573..b75cd8f6 100644
--- a/murano-ci/scripts/prepare_tests.sh
+++ b/murano-ci/scripts/prepare_tests.sh
@@ -143,13 +143,22 @@ function prepare_tests() {
 
     set_config "${section_name}" 'horizon_url' "$(shield_slashes http://${FOUND_IP_ADDRESS}/$DASHBOARD_PATH)" "${config_file}"
 
+    if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
+        set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v2.0/)" "${config_file}"
+    else
+        set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
+    fi
     set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
     set_config "${section_name}" 'murano_url' "$(shield_slashes http://${FOUND_IP_ADDRESS}:8082/)" "${config_file}"
     set_config "${section_name}" 'user' "${ADMIN_USERNAME}" "${config_file}"
     set_config "${section_name}" 'password' "${ADMIN_PASSWORD}" "${config_file}"
     set_config "${section_name}" 'tenant' "${ADMIN_TENANT}" "${config_file}"
     set_config "${section_name}" 'linux_image' "${LINUX_IMAGE}" "${config_file}"
-    set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
+    if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
+        set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v2.0/)" "${config_file}"
+    else
+        set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
+    fi
 
     prepare_murano_apps "${PROJECT_TESTS_DIR}"