diff --git a/.github/workflows/build_template_esp32s2.yml b/.github/workflows/build_template_esp32s2.yml
index fba983e4..bf88bd16 100644
--- a/.github/workflows/build_template_esp32s2.yml
+++ b/.github/workflows/build_template_esp32s2.yml
@@ -33,6 +33,12 @@ jobs:
         cd components/at/private_include
         rm -f at_ota_token.h
         echo -e "#pragma once" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROOM }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROOM }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROVER }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROVER }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO \"${{ secrets.AT_OTA_TOKEN_ESP32S2_SOLO }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO \"${{ secrets.AT_OTA_TOKEN_ESP32S2_SOLO }}\"" >> at_ota_token.h
         echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI \"${{ secrets.AT_OTA_TOKEN_ESP32S2_MINI }}\"" >> at_ota_token.h
         echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI \"${{ secrets.AT_OTA_TOKEN_ESP32S2_MINI }}\"" >> at_ota_token.h
         cd -
diff --git a/.gitlab/ci/build_template.yml b/.gitlab/ci/build_template.yml
index 5ea879b9..6e11e790 100644
--- a/.gitlab/ci/build_template.yml
+++ b/.gitlab/ci/build_template.yml
@@ -102,6 +102,12 @@
 .setup_tokens_esp32s2: &setup_tokens_esp32s2
   - cd components/at/private_include
   - rm -f at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM \"$AT_OTA_TOKEN_ESP32S2_WROOM\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM \"$AT_OTA_TOKEN_ESP32S2_WROOM\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER \"$AT_OTA_TOKEN_ESP32S2_WROVER\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER \"$AT_OTA_TOKEN_ESP32S2_WROVER\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO \"$AT_OTA_TOKEN_ESP32S2_SOLO\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO \"$AT_OTA_TOKEN_ESP32S2_SOLO\"" >> at_ota_token.h
   - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI \"$AT_OTA_TOKEN_ESP32S2_MINI\"" >> at_ota_token.h
   - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI \"$AT_OTA_TOKEN_ESP32S2_MINI\"" >> at_ota_token.h
   - cd -
diff --git a/components/at/private_include/at_ota_token.h b/components/at/private_include/at_ota_token.h
index 8a72f859..e88368bb 100644
--- a/components/at/private_include/at_ota_token.h
+++ b/components/at/private_include/at_ota_token.h
@@ -41,6 +41,13 @@
 #define CONFIG_ESP_AT_OTA_TOKEN_ESP32C6_4MB             CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
 #define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C6_4MB         CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
-#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI             CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
-#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI         CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM           CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER          CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO            CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI            CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
+
+#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM       CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER      CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO        CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI        CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
 #endif
diff --git a/components/at/src/at_default_config.c b/components/at/src/at_default_config.c
index 22a8e7a7..571d9034 100644
--- a/components/at/src/at_default_config.c
+++ b/components/at/src/at_default_config.c
@@ -53,6 +53,9 @@ static const esp_at_module_info_t esp_at_module_info[] = {
 #endif
 
 #if defined(CONFIG_IDF_TARGET_ESP32S2)
+    {"WROOM",          CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM,       CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM},
+    {"WROVER",         CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER,      CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER},
+    {"SOLO",           CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO,        CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO},
     {"MINI",           CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI,        CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI},
 #endif
 };