diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-code.yml
similarity index 97%
rename from .github/workflows/test-cli.yml
rename to .github/workflows/test-code.yml
index d8a889a0..f51fb8a6 100644
--- a/.github/workflows/test-cli.yml
+++ b/.github/workflows/test-code.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
 
 jobs:
-  execute-tests:
+  test-code:
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index fd9b3a66..aaa5dc57 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   test-deploy:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 240
 
     steps:
       - name: Checkout repository
@@ -37,7 +37,7 @@ jobs:
               VAULT_FILE="inventories/github-ci/.password"
 
               # First deploy with debug
-              infinito deploy "$INVENTORY_PATH" -T server -p "$VAULT_FILE" --debug
+              infinito deploy "$INVENTORY_PATH" -T server -p "$VAULT_FILE" --debug --skip-tests
             '
 
       # 2) Second deploy: reset + debug
diff --git a/tasks/stages/01_constructor.yml b/tasks/stages/01_constructor.yml
index 7349ec1e..b1d7ccb5 100644
--- a/tasks/stages/01_constructor.yml
+++ b/tasks/stages/01_constructor.yml
@@ -129,6 +129,8 @@
 - name: "Ensure correct timezone is '{{ HOST_TIMEZONE }}'"
   community.general.timezone:
     name: "{{ HOST_TIMEZONE }}"
+  when: ansible_facts.virtualization_type | default('') not in ['docker', 'containerd', 'podman']
+
 
 - name: "Load base roles"
   include_tasks: "./tasks/groups/{{ item }}-roles.yml"