diff --git a/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml
index 848f0f02..5b877f27 100644
--- a/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml
+++ b/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml
@@ -20,7 +20,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -29,7 +29,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml
index b3117da1..1a31cd5a 100644
--- a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml
+++ b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-mariadb-docs-chromium.yml b/energy-tests/usage_scenario-mariadb-docs-chromium.yml
index 6f82f7c9..e13462b6 100644
--- a/energy-tests/usage_scenario-mariadb-docs-chromium.yml
+++ b/energy-tests/usage_scenario-mariadb-docs-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_user.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_user.py
         note: Create user
         read-notes-stdout: true
         log-stdout: true
@@ -41,7 +41,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_doc_and_share.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_doc_and_share.py
         note: Create document and share
         read-notes-stdout: true
         log-stdout: true
@@ -50,7 +50,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_docs_collaboration.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_docs_collaboration.py
         note: dev
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-mariadb-docs-firefox.yml b/energy-tests/usage_scenario-mariadb-docs-firefox.yml
index c08ab5ea..48eac360 100644
--- a/energy-tests/usage_scenario-mariadb-docs-firefox.yml
+++ b/energy-tests/usage_scenario-mariadb-docs-firefox.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_user.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_user.py firefox
         note: Create user
         read-notes-stdout: true
         log-stdout: true
@@ -41,7 +41,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_doc_and_share.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_doc_and_share.py firefox
         note: Create document and share
         read-notes-stdout: true
         log-stdout: true
@@ -50,7 +50,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_docs_collaboration.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_docs_collaboration.py firefox
         note: dev
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-mariadb-event-chromium.yml b/energy-tests/usage_scenario-mariadb-event-chromium.yml
index 6f13ae23..42c0866e 100644
--- a/energy-tests/usage_scenario-mariadb-event-chromium.yml
+++ b/energy-tests/usage_scenario-mariadb-event-chromium.yml
@@ -20,7 +20,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -29,7 +29,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-mariadb-event-firefox.yml b/energy-tests/usage_scenario-mariadb-event-firefox.yml
index 36b684d3..c979a043 100644
--- a/energy-tests/usage_scenario-mariadb-event-firefox.yml
+++ b/energy-tests/usage_scenario-mariadb-event-firefox.yml
@@ -20,7 +20,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -30,7 +30,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py firefox
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-mariadb-talk-chromium.yml
index 22d5497c..80fe2de1 100644
--- a/energy-tests/usage_scenario-mariadb-talk-chromium.yml
+++ b/energy-tests/usage_scenario-mariadb-talk-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-mariadb-talk-firefox.yml b/energy-tests/usage_scenario-mariadb-talk-firefox.yml
index aa777b3e..f73f07c4 100644
--- a/energy-tests/usage_scenario-mariadb-talk-firefox.yml
+++ b/energy-tests/usage_scenario-mariadb-talk-firefox.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py firefox
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-postgres-docs-chromium.yml b/energy-tests/usage_scenario-postgres-docs-chromium.yml
index 5be851dd..da5e25d5 100644
--- a/energy-tests/usage_scenario-postgres-docs-chromium.yml
+++ b/energy-tests/usage_scenario-postgres-docs-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_user.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_user.py
         note: Create user
         read-notes-stdout: true
         log-stdout: true
@@ -41,7 +41,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_doc_and_share.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_doc_and_share.py
         note: Create document and share
         read-notes-stdout: true
         log-stdout: true
@@ -50,7 +50,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_docs_collaboration.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_docs_collaboration.py
         note: dev
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-postgres-docs-firefox.yml b/energy-tests/usage_scenario-postgres-docs-firefox.yml
index a7ccc34b..8c2fcab5 100644
--- a/energy-tests/usage_scenario-postgres-docs-firefox.yml
+++ b/energy-tests/usage_scenario-postgres-docs-firefox.yml
@@ -24,7 +24,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -33,7 +33,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_user.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_user.py firefox
         note: Create user
         read-notes-stdout: true
         log-stdout: true
@@ -42,7 +42,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_doc_and_share.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_doc_and_share.py firefox
         note: Create document and share
         read-notes-stdout: true
         log-stdout: true
@@ -51,7 +51,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_docs_collaboration.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_docs_collaboration.py firefox
         note: dev
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-postgres-event-chromium.yml b/energy-tests/usage_scenario-postgres-event-chromium.yml
index 757ab02b..230aa278 100644
--- a/energy-tests/usage_scenario-postgres-event-chromium.yml
+++ b/energy-tests/usage_scenario-postgres-event-chromium.yml
@@ -21,7 +21,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -30,7 +30,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-postgres-event-firefox.yml b/energy-tests/usage_scenario-postgres-event-firefox.yml
index d4a5fdda..d4b1cdc4 100644
--- a/energy-tests/usage_scenario-postgres-event-firefox.yml
+++ b/energy-tests/usage_scenario-postgres-event-firefox.yml
@@ -20,7 +20,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -29,7 +29,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py firefox
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-postgres-talk-chromium.yml b/energy-tests/usage_scenario-postgres-talk-chromium.yml
index fc77f4ff..d5660f71 100644
--- a/energy-tests/usage_scenario-postgres-talk-chromium.yml
+++ b/energy-tests/usage_scenario-postgres-talk-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-postgres-talk-firefox.yml b/energy-tests/usage_scenario-postgres-talk-firefox.yml
index 5a560264..47741346 100644
--- a/energy-tests/usage_scenario-postgres-talk-firefox.yml
+++ b/energy-tests/usage_scenario-postgres-talk-firefox.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py firefox
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-sqlite-docs-chromium.yml b/energy-tests/usage_scenario-sqlite-docs-chromium.yml
index befbf900..360e9879 100644
--- a/energy-tests/usage_scenario-sqlite-docs-chromium.yml
+++ b/energy-tests/usage_scenario-sqlite-docs-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_user.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_user.py
         note: Create user
         read-notes-stdout: true
         log-stdout: true
@@ -41,7 +41,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_doc_and_share.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_doc_and_share.py
         note: Create document and share
         read-notes-stdout: true
         log-stdout: true
@@ -50,7 +50,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_docs_collaboration.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_docs_collaboration.py
         note: dev
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-sqlite-docs-firefox.yml b/energy-tests/usage_scenario-sqlite-docs-firefox.yml
index 28b68eb7..58bcc468 100644
--- a/energy-tests/usage_scenario-sqlite-docs-firefox.yml
+++ b/energy-tests/usage_scenario-sqlite-docs-firefox.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_user.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_user.py firefox
         note: Create user
         read-notes-stdout: true
         log-stdout: true
@@ -41,7 +41,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_doc_and_share.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_doc_and_share.py firefox
         note: Create document and share
         read-notes-stdout: true
         log-stdout: true
@@ -50,7 +50,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_docs_collaboration.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_docs_collaboration.py firefox
         note: dev
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-sqlite-event-chromium.yml b/energy-tests/usage_scenario-sqlite-event-chromium.yml
index eea66e3e..86be36ef 100644
--- a/energy-tests/usage_scenario-sqlite-event-chromium.yml
+++ b/energy-tests/usage_scenario-sqlite-event-chromium.yml
@@ -20,7 +20,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -29,7 +29,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-sqlite-event-firefox.yml b/energy-tests/usage_scenario-sqlite-event-firefox.yml
index 1f338bf4..07ba5aca 100644
--- a/energy-tests/usage_scenario-sqlite-event-firefox.yml
+++ b/energy-tests/usage_scenario-sqlite-event-firefox.yml
@@ -20,7 +20,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -29,7 +29,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_create_event.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_create_event.py firefox
         note: Creating event
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-sqlite-talk-chromium.yml b/energy-tests/usage_scenario-sqlite-talk-chromium.yml
index 3645b68d..7602c03e 100644
--- a/energy-tests/usage_scenario-sqlite-talk-chromium.yml
+++ b/energy-tests/usage_scenario-sqlite-talk-chromium.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true
diff --git a/energy-tests/usage_scenario-sqlite-talk-firefox.yml b/energy-tests/usage_scenario-sqlite-talk-firefox.yml
index 5c19e80c..f557a133 100644
--- a/energy-tests/usage_scenario-sqlite-talk-firefox.yml
+++ b/energy-tests/usage_scenario-sqlite-talk-firefox.yml
@@ -23,7 +23,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_install.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_install.py firefox
         note: Installing Nextcloud
         read-notes-stdout: true
         log-stdout: true
@@ -32,7 +32,7 @@ flow:
     container: gcb-playwright
     commands:
       - type: console
-        command: python3 /tmp/repo/nextcloud_talk.py firefox
+        command: python3 /tmp/repo/energy_tests/nextcloud_talk.py firefox
         note: Starting conversation
         read-notes-stdout: true
         read-sci-stdout: true