diff --git a/roles/manila/defaults/main.yml b/roles/manila/defaults/main.yml
index 2d740aa..b35bb85 100644
--- a/roles/manila/defaults/main.yml
+++ b/roles/manila/defaults/main.yml
@@ -31,7 +31,7 @@
 
 # Service instance image
 manila_image_name: manila-service-image
-manila_image_url: "https://object-storage.public.mtl1.vexxhost.net/swift/v1/b98c5fdfb9be4e39a34b93d0b425ac2b/atmosphere-images/manila-{{ atmosphere_version }}.qcow2" # noqa yaml[line-length]
+manila_image_url: "https://object-storage.public.mtl1.vexxhost.net/swift/v1/b98c5fdfb9be4e39a34b93d0b425ac2b/atmosphere-images/manila-{{ atmosphere_version | regex_replace('-(beta|alpha).','.dev') }}.qcow2" # noqa yaml[line-length]
 manila_image_container_format: bare
 manila_image_disk_format: qcow2
 
diff --git a/tox.ini b/tox.ini
index 6e55c35..df03da0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,10 +11,12 @@
   PYTHONDONTWRITEBYTECODE=1
 passenv =
   KUBECONFIG
+  ATMOSPHERE_*
 
 [testenv:venv]
 passenv =
-  ATMOSPHERE_NETWORK_BACKEND
+  ATMOSPHERE_*
+  OS_*
 commands =
   {posargs}
 
@@ -51,7 +53,8 @@
 
 [testenv:molecule-venv]
 passenv =
-  ATMOSPHERE_NETWORK_BACKEND
+  ATMOSPHERE_*
+  OS_*
 deps =
   molecule
   kubernetes