diff --git a/modules/cucumber_testsuite/main.tf b/modules/cucumber_testsuite/main.tf
index 1d9e8f932..6ab8e586f 100644
--- a/modules/cucumber_testsuite/main.tf
+++ b/modules/cucumber_testsuite/main.tf
@@ -85,15 +85,14 @@ module "server" {
   additional_repos               = lookup(local.additional_repos, "server", {})
   additional_repos_only          = lookup(local.additional_repos_only, "server", false)
   additional_packages            = lookup(local.additional_packages, "server", [])
-  repository_disk_use_cloud_setup= lookup(local.repository_disk_use_cloud_setup, "server", false)
-  repository_disk_size           = lookup(local.repository_disk_size, "server", null)
   login_timeout                  = var.login_timeout
 
   saltapi_tcpdump   = var.saltapi_tcpdump
   provider_settings = lookup(local.provider_settings_by_host, "server", {})
-  server_mounted_mirror         = lookup(local.server_mounted_mirror, "server", {})
-  repository_disk_size          = lookup(local.repository_disk_size, "server", {})
-  database_disk_size            = lookup(local.database_disk_size, "server", {})
+  server_mounted_mirror = lookup(local.server_mounted_mirror, "server", {})
+  repository_disk_size            = lookup(local.repository_disk_size, "server", {})
+  database_disk_size              = lookup(local.database_disk_size, "server", {})
+  repository_disk_use_cloud_setup = lookup(local.repository_disk_use_cloud_setup, "server", false)
 }
 
 module "server_containerized" {
diff --git a/modules/cucumber_testsuite/variables.tf b/modules/cucumber_testsuite/variables.tf
index 1303ee7cc..eec958759 100644
--- a/modules/cucumber_testsuite/variables.tf
+++ b/modules/cucumber_testsuite/variables.tf
@@ -79,7 +79,7 @@ variable "host_settings" {
 
 // server
 variable "product_version" {
-  description = "One of: 4.3-nightly, 4.3-released, 4.3-pr, 4.3-beta, 4.3-VM, 4.3-VM-released, head, test, uyuni-master, uyuni-released, uyuni-pr"
+  description = "One of: 4.2-nightly, 4.2-released, 4.3-nightly, 4.3-released, 4.3-pr, 4.3-beta, 4.3-VM, 4.3-VM-released, head, uyuni-master, uyuni-released, uyuni-pr"
   type        = string
 }
 
diff --git a/salt/server/additional_disk.sls b/salt/server/additional_disk.sls
index 2c1bb7e3a..c210f0b16 100644
--- a/salt/server/additional_disk.sls
+++ b/salt/server/additional_disk.sls
@@ -12,7 +12,11 @@ susemanager-cloud-setup-server:
 
 spacewalk_directory:
   cmd.run:
+{% if grains.get('database_disk_size') > 0 %}
+    - name: suma-storage /dev/{{grains['data_disk_device']}} /dev/{{grains['second_data_disk_device']}}
+{% else %}
     - name: suma-storage /dev/{{grains['data_disk_device']}}
+{% endif %}
     - require:
       - pkg: susemanager-cloud-setup-server