diff --git a/config/template.json b/config/template.json
index 36ce9596a..06183df2d 100644
--- a/config/template.json
+++ b/config/template.json
@@ -1825,6 +1825,11 @@
     "OpsiFleetFilter": {
       "Filter": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1"
     },
+    "OpsiFleet": {
+      "Fleet": 1,
+      "FleetMode": "combat_auto",
+      "Submarine": true
+    },
     "Storage": {
       "Storage": {}
     }
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index fd4344ed2..be1cb7161 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -2818,71 +2818,71 @@
         "type": "select",
         "value": "campaign_main",
         "option": [
-          "event_20230914_cn",
-          "event_20220915_cn",
-          "event_20220414_cn",
-          "event_20230817_cn",
-          "event_20230803_cn",
-          "event_20211125_cn",
-          "event_20200917_cn",
-          "event_20220818_cn",
-          "event_20220428_cn",
-          "event_20210527_cn",
+          "event_20200227_cn",
+          "event_20200312_cn",
+          "event_20200326_cn",
+          "event_20200423_cn",
+          "event_20200507_cn",
+          "event_20200521_cn",
+          "event_20200521_en",
           "event_20200603_cn",
-          "event_20230525_cn",
-          "event_20220526_cn",
-          "event_20201126_cn",
-          "event_20210819_cn",
-          "event_20211111_cn",
-          "event_20210422_cn",
-          "event_20210624_cn",
-          "event_20230223_cn",
-          "event_20220224_cn",
+          "event_20200603_en",
+          "event_20200611_en",
+          "event_20200716_en",
+          "event_20200723_cn",
           "event_20200806_cn",
-          "event_20210610_tw",
-          "event_20210225_cn",
-          "event_20211229_cn",
-          "event_20221222_cn",
-          "event_20221124_cn",
-          "event_20210325_cn",
+          "event_20200820_cn",
+          "event_20200903_en",
+          "event_20200917_cn",
+          "event_20201002_en",
+          "event_20201012_cn",
+          "event_20201029_cn",
+          "event_20201126_cn",
           "event_20201229_cn",
           "event_20210121_cn",
-          "event_20210916_cn",
-          "event_20200903_en",
-          "event_20220324_cn",
-          "event_20211028_cn",
-          "event_20220728_cn",
-          "event_20201029_cn",
-          "event_20200820_cn",
-          "event_20201012_cn",
-          "event_20220407_tw",
-          "event_20220310_tw",
-          "event_20220210_cn",
-          "event_20211028_tw",
-          "event_20210722_cn",
-          "event_20200723_cn",
-          "event_20210624_tw",
-          "event_20210527_tw",
-          "event_20210429_tw",
-          "event_20210415_tw",
+          "event_20210225_cn",
           "event_20210225_tw",
-          "event_20200312_cn",
-          "event_20201002_en",
-          "event_20200716_en",
-          "event_20200611_en",
-          "event_20200603_en",
-          "event_20200521_en",
-          "event_20200521_cn",
-          "event_20200507_cn",
-          "event_20200423_cn",
-          "event_20200326_cn",
-          "event_20200227_cn"
+          "event_20210325_cn",
+          "event_20210415_tw",
+          "event_20210422_cn",
+          "event_20210429_tw",
+          "event_20210527_cn",
+          "event_20210527_tw",
+          "event_20210610_tw",
+          "event_20210624_cn",
+          "event_20210624_tw",
+          "event_20210722_cn",
+          "event_20210819_cn",
+          "event_20210916_cn",
+          "event_20211028_cn",
+          "event_20211028_tw",
+          "event_20211111_cn",
+          "event_20211125_cn",
+          "event_20211229_cn",
+          "event_20220210_cn",
+          "event_20220224_cn",
+          "event_20220310_tw",
+          "event_20220324_cn",
+          "event_20220407_tw",
+          "event_20220414_cn",
+          "event_20220428_cn",
+          "event_20220526_cn",
+          "event_20220728_cn",
+          "event_20220818_cn",
+          "event_20220915_cn",
+          "event_20221124_cn",
+          "event_20221222_cn",
+          "event_20230223_cn",
+          "event_20230525_cn",
+          "event_20230803_cn",
+          "event_20230817_cn",
+          "event_20230914_cn"
         ],
         "display": "disabled",
         "cn": "event_20230914_cn",
         "en": "event_20230914_cn",
         "jp": "event_20230914_cn",
-        "tw": "event_20220915_cn"
+        "tw": "event_20201229_cn"
       },
       "Mode": {
         "type": "select",
@@ -8985,6 +8985,34 @@
         "value": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1"
       }
     },
+    "OpsiFleet": {
+      "Fleet": {
+        "type": "select",
+        "value": 1,
+        "option": [
+          1,
+          2,
+          3,
+          4
+        ],
+        "display": "hide"
+      },
+      "FleetMode": {
+        "type": "select",
+        "value": "combat_auto",
+        "option": [
+          "combat_auto",
+          "combat_manual",
+          "stand_still_in_the_middle",
+          "hide_in_bottom_left"
+        ]
+      },
+      "Submarine": {
+        "type": "checkbox",
+        "value": true,
+        "display": "hide"
+      }
+    },
     "Storage": {
       "Storage": {
         "type": "storage",
diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml
index 171c0066b..b1378cc83 100644
--- a/module/config/argument/override.yaml
+++ b/module/config/argument/override.yaml
@@ -413,6 +413,9 @@ OpsiStronghold:
     SuccessInterval: 60
     FailureInterval: 60
     ServerUpdate: 00:00
+  OpsiFleet:
+    Fleet: 1
+    Submarine: true
 OpsiMeowfficerFarming:
   Scheduler:
     SuccessInterval: 30
diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml
index 34ae4b91f..b81db558e 100644
--- a/module/config/argument/task.yaml
+++ b/module/config/argument/task.yaml
@@ -309,6 +309,7 @@ Opsi:
       - Scheduler
       - OpsiStronghold
       - OpsiFleetFilter
+      - OpsiFleet
     OpsiMonthBoss:
       - Scheduler
       - OpsiMonthBoss