diff --git a/.zuul.yaml b/.zuul.yaml
index 7a49cee5..41cc1e2f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,12 +1,12 @@
 - job:
     name: os-autoinst-tox
     run: ci/tox.yaml
-    nodeset: fedora-35-vm
+    nodeset: fedora-latest-container
 
 - job:
     name: os-autoinst-perl
     run: ci/perl.yaml
-    nodeset: fedora-35-vm
+    nodeset: fedora-latest-container
 
 - project:
     check:
diff --git a/tox.ini b/tox.ini
index 0a7f2ae6..1aaa0e5f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,8 +12,8 @@ deps =
     pytest-cov
 
 commands=
-    ./fifloader.py --clean templates.fif.json templates-updates.fif.json
-    ./check-needles.py
+    python ./fifloader.py --clean templates.fif.json templates-updates.fif.json
+    python ./check-needles.py
     py.test unittests/
     py.test --cov-report term-missing --cov-report xml --cov fifloader unittests/
     diff-cover coverage.xml --fail-under=90 --compare-branch=origin/master