diff --git a/python/understack-tests/README.md b/python/understack-tests/README.md
index d7b945bf3..5a03924fe 100644
--- a/python/understack-tests/README.md
+++ b/python/understack-tests/README.md
@@ -24,12 +24,12 @@ the testing container as environment variables.
 ## Usage
 
 ```shell
-docker run --rm --env-file dev.env ghcr.io/rackerlabs/understack/understack-tests run-scenario build_a_single_gp2small_with_network.yaml
+docker run --rm --env-file dev.env ghcr.io/rackerlabs/understack/understack-tests run-scenario build_a_single_server_with_network.yaml
 ```
 
 ### Available scenarios
 
-- **`build_a_single_gp2small_with_network.yaml`** - boots a simple Ubuntu GP2.SMALL
+- **`build_a_single_server_with_network.yaml`** - boots a simple Ubuntu GP2.SMALL
   server with a plain networking setup. The network is automatically created
   and removed.
 - **`floating_ips.yaml`** - build a network, server, router and associate and
diff --git a/python/understack-tests/build_a_single_gp2small_with_network.yaml b/python/understack-tests/build_a_single_server_with_network.yaml
similarity index 75%
rename from python/understack-tests/build_a_single_gp2small_with_network.yaml
rename to python/understack-tests/build_a_single_server_with_network.yaml
index 3518abac1..53300df16 100644
--- a/python/understack-tests/build_a_single_gp2small_with_network.yaml
+++ b/python/understack-tests/build_a_single_server_with_network.yaml
@@ -1,12 +1,12 @@
 version: 2
-title: "Create the network, provision a gp2.small Ubuntu server and delete it afterwards."
+title: "Create the network, provision a Ubuntu server and delete it afterwards."
 subtasks:
   - title: "Boot and delete"
     workloads:
     - scenario:
         NovaServers.boot_and_delete_server:
           flavor:
-            name: gp2.small
+            name: "{{ flavor | default('gp2.small') }}"
           image:
             name: ^Ubuntu 24.*$
           config_drive: true