diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php
index f70c8f86d..7c91bfaf2 100644
--- a/Layout/default/Preorder/include/preorder-detail.php
+++ b/Layout/default/Preorder/include/preorder-detail.php
@@ -7,8 +7,12 @@
         <ul class="nav nav-tabs order-tab">
           <li class="nav-item"><a class="nav-link active" href="#preorder-detail-<?=$preorder->id?>-detail" data-toggle="tab" aria-expanded="false">Bestellung</a></li>
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-address" data-toggle="tab" aria-expanded="false">Adressdetails</a></li>
-            <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-flags" data-toggle="tab" aria-expanded="false">Status</a></li>
-          <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-rimo" data-toggle="tab" aria-expanded="false">RIMO</a></li>
+          <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-flags" data-toggle="tab" aria-expanded="false">Status</a></li>
+          <?php if($preorder->campaign->fulfillment != "citycom_oan"): ?>
+            <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-rimo" data-toggle="tab" aria-expanded="false">RIMO</a></li>
+          <?php else: ?>
+            <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-citycom-oan" data-toggle="tab" aria-expanded="false">Citycom OAN</a></li>
+          <?php endif; ?>
           <?php if($preorder->adb_hausnummer->borderpoint_lat && $preorder->adb_hausnummer->borderpoint_long): ?>
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-map" data-toggle="tab" aria-expanded="false" onclick="loadBorderpointMap(<?=$preorder->id?>)">Übergabepunkt</a></li>
           <?php endif; ?>
@@ -430,6 +434,7 @@
         </div>
       </div>
 
+      <?php if($preorder->campaign->fulfillment != "citycom_oan"): ?>
       <div id="preorder-detail-<?=$preorder->id?>-rimo" class="tab-pane">
         <div class="row justify-content-center">
           <div class="col-12">
@@ -564,68 +569,126 @@
                             <p>Kein FCP zugewiesen</p>
                             <?php endif; ?>
 
-                      </div>
+                        </div>
                   
 
-                  <div class="row col">
-                    <h3>
-                      Patchposition
-                      <?php if($preorder->adb_wohneinheit_id): ?>
-                        <small id="preorder-detail-<?=$preorder->id?>-patchposition-edit"><a href="#" onclick="togglePortdata(<?=$preorder->id?>); return false;"><i class="fas fa-pencil"></i> Bearbeiten</a></small>
-                        <span id="preorder-detail-<?=$preorder->id?>-patchposition-controls" class="hidden">
-                          <button type="button" class="btn btn-sm btn-primary" onclick="savePortdata(<?=$preorder->id?>)"><i class="fas fa-check"></i></button>
-                          <button type="button" class="btn btn-sm btn-secondary" onclick="togglePortdata(<?=$preorder->id?>)"><i class="fas fa-times"></i></button>
-                        </span>
-                      <?php endif; ?>
-                    </h3>
-                    <table class="table table-sm table-striped" id="preorder-detail-<?=$preorder->id?>-patchposition">
-                      <tr>
-                        <th>Equipment Name:</th>
-                        <td>
-                          <span id="preorder-detail-<?=$preorder->id?>-patchposition-string"><?=$preorder->adb_wohneinheit->getPatchEqString()?></span>
-                          <table class="row hidden" id="preorder-detail-<?=$preorder->id?>-patchposition-data-form">
-                            <tr>
-                              <th>Cluster:</td>
-                              <td><input type="text" class="form-control" name="patch_cluster"
-                                         data-default="<?=($preorder->adb_wohneinheit->patch_cluster) ? $preorder->adb_wohneinheit->patch_cluster : $preorder->adb_hausnummer->netzgebiet->extref?>"
-                                         /></td>
-                            </tr><tr>
-                              <th>Shelf:</th>
-                              <td><input type="text" class="form-control" name="patch_shelf"
-                                         data-default="<?=$preorder->adb_wohneinheit->patch_shelf?>"
-                                         /></td>
-                            </tr><tr>
-                              <th>Module:</th>
-                              <td><input type="text" class="form-control" name="patch_module"
-                                         data-default="<?=$preorder->adb_wohneinheit->patch_module?>"
-                                         /></td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr>
-                        <th>Equipment Port:</th>
-                        <td>
-                          <span id="preorder-detail-<?=$preorder->id?>-patchposition-port"><?=$preorder->adb_wohneinheit->patch_port?></span>
-                          <table class="row hidden" id="preorder-detail-<?=$preorder->id?>-patchposition-port-form">
-                            <tr>
-                              <th>Port:</td>
-                              <td><input type="text" class="form-control" name="patch_port" data-default="<?=$preorder->adb_wohneinheit->patch_port?>" /></td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                    </table>
+                      <div class="row col">
+                        <h3>
+                          Patchposition
+                          <?php if($preorder->adb_wohneinheit_id): ?>
+                            <small id="preorder-detail-<?=$preorder->id?>-patchposition-edit"><a href="#" onclick="togglePortdata(<?=$preorder->id?>); return false;"><i class="fas fa-pencil"></i> Bearbeiten</a></small>
+                            <span id="preorder-detail-<?=$preorder->id?>-patchposition-controls" class="hidden">
+                              <button type="button" class="btn btn-sm btn-primary" onclick="savePortdata(<?=$preorder->id?>)"><i class="fas fa-check"></i></button>
+                              <button type="button" class="btn btn-sm btn-secondary" onclick="togglePortdata(<?=$preorder->id?>)"><i class="fas fa-times"></i></button>
+                            </span>
+                          <?php endif; ?>
+                        </h3>
+                        <table class="table table-sm table-striped" id="preorder-detail-<?=$preorder->id?>-patchposition">
+                          <tr>
+                            <th>Equipment Name:</th>
+                            <td>
+                              <span id="preorder-detail-<?=$preorder->id?>-patchposition-string"><?=$preorder->adb_wohneinheit->getPatchEqString()?></span>
+                              <table class="row hidden" id="preorder-detail-<?=$preorder->id?>-patchposition-data-form">
+                                <tr>
+                                  <th>Cluster:</th>
+                                  <td><input type="text" class="form-control" name="patch_cluster"
+                                             data-default="<?=($preorder->adb_wohneinheit->patch_cluster) ? $preorder->adb_wohneinheit->patch_cluster : $preorder->adb_hausnummer->netzgebiet->extref?>"
+                                             /></td>
+                                </tr><tr>
+                                  <th>Shelf:</th>
+                                  <td><input type="text" class="form-control" name="patch_shelf"
+                                             data-default="<?=$preorder->adb_wohneinheit->patch_shelf?>"
+                                             /></td>
+                                </tr><tr>
+                                  <th>Module:</th>
+                                  <td><input type="text" class="form-control" name="patch_module"
+                                             data-default="<?=$preorder->adb_wohneinheit->patch_module?>"
+                                             /></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr>
+                            <th>Equipment Port:</th>
+                            <td>
+                              <span id="preorder-detail-<?=$preorder->id?>-patchposition-port"><?=$preorder->adb_wohneinheit->patch_port?></span>
+                              <table class="row hidden" id="preorder-detail-<?=$preorder->id?>-patchposition-port-form">
+                                <tr>
+                                  <th>Port:</th>
+                                  <td><input type="text" class="form-control" name="patch_port" data-default="<?=$preorder->adb_wohneinheit->patch_port?>" /></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </div>
+                  
+                  
+                    </div>
                   </div>
-                  
-                  
                 </div>
               </div>
             </div>
-          </div>
         </div>
       </div>
-      </div>
+      <?php endif; ?>
+
+        <?php if($preorder->campaign->fulfillment == "citycom_oan"): ?>
+        <div id="preorder-detail-<?=$preorder->id?>-citycom-oan" class="tab-pane">
+            <div class="row justify-content-center">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-body">
+                            <div class="card-header bg-info text-white pl-2 pr-2 pt-1 pb-1">Citycom OAN</div>
+                            <div class="row">
+                                <div class="col-6">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h3>Services</h3>
+                                            <table class="table table-sm table-striped">
+                                                <tr>
+                                                    <th>stag</th>
+                                                    <th>ctag</th>
+                                                    <th>Typ</th>
+                                                    <th>External ID</th>
+                                                    <th>External State</th>
+                                                </tr>
+                                                <?php if(is_array($preorder->ctags) && count($preorder->ctags)): ?>
+                                                    <?php foreach($preorder->ctags as $ctag): ?>
+                                                    <tr>
+                                                        <td class="text-monospace"><?=$ctag->stag?></td>
+                                                        <td class="text-monospace"><?=$ctag->ctag?></td>
+                                                        <td class="text-monospace"><?=$ctag->service_type?></td>
+                                                        <td class="text-monospace"><?=htmlentities($ctag->ext_id)?></td>
+                                                        <td class="text-monospace"><?=htmlentities($ctag->ext_status)?></td>
+                                                    </tr>
+                                                    <?php endforeach; ?>
+                                                <?php endif; ?>
+                                            </table>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-6">
+                                            <h3>ONT</h3>
+                                            <table class="table table-sm table-striped">
+                                                <tr>
+                                                    <th>SN</th>
+                                                    <td class="text-monospace"><?=($preorder->citycomoan) ? $preorder->citycomoan->ont_sn : ""?></td>
+                                                </tr><tr>
+                                                    <th>FSAN</th>
+                                                    <td class="text-monospace"><?=($preorder->citycomoan) ? $preorder->citycomoan->ont_gpid : ""?></td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php endif; ?>
 
         <div id="preorder-detail-<?=$preorder->id?>-flags" class="tab-pane">
             <div class="row justify-content-center">
diff --git a/Layout/default/Preordercampaign/Form.php b/Layout/default/Preordercampaign/Form.php
index 4482513bd..714d766de 100644
--- a/Layout/default/Preordercampaign/Form.php
+++ b/Layout/default/Preordercampaign/Form.php
@@ -140,6 +140,9 @@
                                             <option value="rimo" <?= ($campaign->fulfillment == "rimo") ? "selected='selected'" : "" ?>>
                                                 RIMO
                                             </option>
+                                            <option value="citycom_oan" <?= ($campaign->fulfillment == "citycom_oan") ? "selected='selected'" : "" ?>>
+                                                Citycom OAN
+                                            </option>
                                             <option value="thirdparty" <?= ($campaign->fulfillment == "thirdparty") ? "selected='selected'" : "" ?>>
                                                 Drittsystem
                                             </option>
diff --git a/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php b/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
index 72865862a..0420f7e42 100644
--- a/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
+++ b/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
@@ -89,7 +89,7 @@ class SnoppCitycom extends Modules\ApiControllerModule
         }
 
 
-        if($preorder->campaign->name == "Citycom - Graz") {
+        if($preorder->campaign->fulfillment == "citycom_oan") {
             $data["product_name"] = "Estmk Greenstream OAN $bb_down/$bb_up";
         }
 
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index c6c602367..cf9a25116 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -21,6 +21,8 @@ class Preorder extends mfBaseModel {
     private $attribute = [];
     private $logistics;
     private $history;
+    private $citycomoan; // ONT data
+    private $ctags; // network-keyed array of Ctags
 
     protected function beforeUpdate($data) {
         if(!array_key_exists("edit_by", $data)) {
@@ -1555,6 +1557,20 @@ class Preorder extends mfBaseModel {
                 return ADBRimoFcp::get($this->adb_hausnummer->fcp_id);
             }
 
+            if($name == "citycomoan") {
+                $ccoan = PreorderCitycomOan::getFirst(["preorder_id" => $this->id]);
+                if(!$ccoan) return null;
+                $this->citycomoan = $ccoan;
+                return $this->citycomoan;
+            }
+
+            if($name == "ctags") {
+                $ctags = PreorderCtag::searchActive(["preorder_id" => $this->id]);
+                if(!$ctags) return null;
+                $this->ctags = $ctags;
+                return $this->ctags;
+            }
+
             if($name == "editor") {
                 $this->editor = new User($this->edit_by);
                 return $this->editor;
diff --git a/application/Preordercampaign/PreordercampaignController.php b/application/Preordercampaign/PreordercampaignController.php
index 5dd9d314e..b3b8fa9b4 100644
--- a/application/Preordercampaign/PreordercampaignController.php
+++ b/application/Preordercampaign/PreordercampaignController.php
@@ -236,6 +236,8 @@ class PreordercampaignController extends mfBaseController {
       $data['fulfillment'] = "thirdparty";
     } elseif($r->fulfillment == "rimo") {
       $data['fulfillment'] = "rimo";
+    } elseif($r->fulfillment == "citycom_oan") {
+        $data['fulfillment'] = "citycom_oan";
     } else {
       $data['fulfillment'] = "thetool";
     }
diff --git a/db/migrations/20250820104230_preordercampaign_add_fulfillment_citycom_oan.php b/db/migrations/20250820104230_preordercampaign_add_fulfillment_citycom_oan.php
new file mode 100644
index 000000000..ac5fd79a8
--- /dev/null
+++ b/db/migrations/20250820104230_preordercampaign_add_fulfillment_citycom_oan.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class PreordercampaignAddFulfillmentCitycomOan extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("Preordercampaign");
+            $table->changeColumn("fulfillment", "enum", ["null" => false, "default" => "thetool", "values" => ['thetool', 'thirdparty', 'rimo', 'citycom_oan']]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}