diff --git a/.gitlab/ci/build_esp32.yml b/.gitlab/ci/build_esp32.yml
index 60e24f1d..272c9caf 100644
--- a/.gitlab/ci/build_esp32.yml
+++ b/.gitlab/ci/build_esp32.yml
@@ -60,7 +60,7 @@ esp32_sdio_at:
 esp32_at_wifi_function_test:
   extends:
     - .build_template_esp32
-    - .before_script_esp32_enable_all_wifi_cmds
+    - .before_script_enable_all_wifi_cmds
     - .rules:build:build_project_on_protected
   variables:
     MODULE_NAME: "WROVER-32"
diff --git a/.gitlab/ci/build_esp32c2.yml b/.gitlab/ci/build_esp32c2.yml
index 8f1b4673..e49ec740 100644
--- a/.gitlab/ci/build_esp32c2.yml
+++ b/.gitlab/ci/build_esp32c2.yml
@@ -40,7 +40,7 @@ esp32c2_4mb_at_xtal_40mhz_test:
 esp32c2_at_wifi_function_test:
   extends:
     - .build_template_esp32c2
-    - .before_script_esp32c2_enable_all_wifi_cmds
+    - .before_script_enable_all_wifi_cmds
     - .rules:build:build_project_on_protected
   variables:
     MODULE_NAME: "ESP32C2-4MB"
diff --git a/.gitlab/ci/build_esp32c3.yml b/.gitlab/ci/build_esp32c3.yml
index 31baa517..c768dd06 100644
--- a/.gitlab/ci/build_esp32c3.yml
+++ b/.gitlab/ci/build_esp32c3.yml
@@ -29,10 +29,10 @@ esp32c3_rainmaker:
   variables:
     MODULE_NAME: "ESP32C3_RAINMAKER"
 
-esp32c3_at_full_function_test:
+esp32c3_at_wifi_function_test:
   extends:
     - .build_template_esp32c3
-    - .before_script_esp32c3_enable_all_wifi_cmds
+    - .before_script_enable_all_wifi_cmds
     - .rules:build:build_project_on_protected
   variables:
     MODULE_NAME: "MINI-1"
diff --git a/.gitlab/ci/build_esp32c6.yml b/.gitlab/ci/build_esp32c6.yml
index 124c72c5..901976e8 100644
--- a/.gitlab/ci/build_esp32c6.yml
+++ b/.gitlab/ci/build_esp32c6.yml
@@ -14,3 +14,11 @@ esp32c6_4mb_at_tat_debug:
     - .rules:build:build_project_on_protected
   variables:
     MODULE_NAME: "ESP32C6-4MB"
+
+esp32c6_at_wifi_function_test:
+  extends:
+    - .build_template_esp32c6
+    - .before_script_enable_all_wifi_cmds
+    - .rules:build:build_project_on_protected
+  variables:
+    MODULE_NAME: "ESP32C6-4MB"
diff --git a/.gitlab/ci/build_esp32s2.yml b/.gitlab/ci/build_esp32s2.yml
index 855d2be6..fc6560bd 100644
--- a/.gitlab/ci/build_esp32s2.yml
+++ b/.gitlab/ci/build_esp32s2.yml
@@ -14,3 +14,11 @@ esp32s2_mini_at_tat_debug:
     - .rules:build:build_project_on_protected
   variables:
     MODULE_NAME: "MINI"
+
+esp32s2_at_wifi_function_test:
+  extends:
+    - .build_template_esp32s2
+    - .before_script_enable_all_wifi_cmds
+    - .rules:build:build_project_on_protected
+  variables:
+    MODULE_NAME: "MINI"
diff --git a/.gitlab/ci/build_template.yml b/.gitlab/ci/build_template.yml
index 6e11e790..358bb17b 100644
--- a/.gitlab/ci/build_template.yml
+++ b/.gitlab/ci/build_template.yml
@@ -216,12 +216,11 @@
     - *enable_at_debugs
     - *enlarge_app_partition
 
-.before_script_esp32_enable_all_wifi_cmds:
+.before_script_enable_all_wifi_cmds:
   before_script:
     - source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
     - add_gitlab_ssh_keys
     - get_module_configs
-    - *setup_tokens_esp32
     - *enable_all_wifi_cmds
     - *disable_ble_cmds
     - *enlarge_app_partition
@@ -253,23 +252,6 @@
     - *setup_tokens_esp32c2
     - *enable_40mhz_xtal
 
-.before_script_esp32c2_enable_all_wifi_cmds:
-  before_script:
-    - source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
-    - add_gitlab_ssh_keys
-    - get_module_configs
-    - *setup_tokens_esp32c2
-    - *enable_all_wifi_cmds
-
-.before_script_esp32c3_enable_all_wifi_cmds:
-  before_script:
-    - source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
-    - add_gitlab_ssh_keys
-    - get_module_configs
-    - *setup_tokens_esp32c3
-    - *enable_all_wifi_cmds
-    - *enlarge_app_partition
-
 #####################
 # Build at examples #
 #####################