diff --git a/magma_configs/acs_common.yml b/magma_configs/acs_common.yml
index f757526..dc46cd7 100644
--- a/magma_configs/acs_common.yml
+++ b/magma_configs/acs_common.yml
@@ -1,16 +1,110 @@
-# SPDX-FileCopyrightText: 2020 The Magma Authors.
 # SPDX-FileCopyrightText: 2022 Open Networking Foundation <support@opennetworking.org>
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-bandwidthMhz: 100
-specialSubframePattern: 7
-earfcndl: 44490
-plmnidList: "00101"
-pci: 1
-allowEnodebTransmit: False
-subframeAssignment: 2
-tac: 1
-cell_id: 1
-mme_address: ""
-mme_port: 36412
+basic:
+  cell_id: 100
+  mme_address: 172.21.143.206
+  mme_port: 36412
+  plmn_list: "305010"
+  pci_list: "100,101"
+  allow_enodeb_transmit: False
+
+  carrier_number: 2
+  carrier_agg_enable: False
+
+# Automation Configuration Server
+acs:
+  # To enable/disable to connect the management server (ACS)
+  cwmp_enable: True
+  # Define to enable/disable a periodic inform
+  periodic_inform_enable: True
+  # Interval of a preiodic inform send to ACS
+  periodic_inform_interval: 180
+
+cell:
+  # If True, 64QAM is allowed [TS 36.331]
+  enable64qam: True
+  # Physical Cell ID for cell 1 and cell 2
+  pci1: 100
+  pci2: 101
+  # Tracking Area Code for cell 1 and cell 2
+  tac1: 501
+  tac2: 502
+  # Downlink/Uplink bandwidth
+  downlink_bandwidth: 25
+  uplink_bandwidth: 25
+  # EARFCN for 1st frequency band
+  earfcn_downlink1: 55440
+  earfcn_uplink1: 55440
+  # EARFCN for 2nd frequency band
+  earfcn_downlink2: 55640
+  earfcn_uplink2: 55640
+  # EARFCN for 1st + 2nd frequency band
+  earfcn_downlink_list: "55440,55640"
+  earfcn_uplink_list: "55440,55640"
+  # First/Second Frequency Band Indicator
+  frequency_band_1: 48
+  frequency_band_2: 48
+  # Frequency Band List
+  frequency_band_list: "48, 48"
+  # The DL/UL subframe configuration
+  subframe_assignment: 2
+  # The TDD special sub-frame pattern [TS 36.331 sec 6.3.2]
+  special_subframe_pattern: 7
+
+  # The real TX power
+  tx_power: 20
+  # Tunnel type
+  tunnel_type: "Device.IP.Interface.1.IPv4Address.1."
+
+
+# Femtocell Access Point Control Parameters
+fap_control:
+  # The administrative state of LTE FAP
+  #  If True, the cell unlock and enable RF to serve traffic
+  admin_state: False
+  # Radio Resource Management
+  is_ca_frequency_contiguous: 0
+
+# Radio Environment Map Parameters
+rem:
+  primary_source: "FREE_RUNNING"
+
+# Spectrum Access System (SAS)
+sas:
+  # If True, eNodeB will be admistrated by SAS
+  sas_enable: True
+  # If True, it indicates device configuration was signed by CPI key
+  cpi_enable: True
+  # If True, add manufacturer name as prefix of Serial Number
+  manufacturer_prefix_enable: True
+  # The SAS server address
+  sas_server_url: "https://sas.goog/v1.2/"
+  # The username registered to SAS
+  sas_uid: "aether"
+  # Define device's SAS category [CFR 96.39(c)]
+  sas_category: "A"
+  # PAL or GAA
+  sas_channel_type: "GAA"
+  # The device's certification name, it uses to communicate with SAS server
+  sas_cert_subject: "ENODEBD_CONFIGURED_SAS_CERT"
+  # Location: indoor / outdoor
+  sas_location: "indoor"
+  # AGL or AMSL
+  sas_height_type: "AGL"
+  # FCC ID of device
+  sas_fccid: "ENODEBD_CONFIGURED_FCCID"
+  # RECEIVED_POWER_WITH_GRANT / RECEIVED_POWER_WITHOUT_GRANT
+  sas_measure_capability: "RECEIVED_POWER_WITHOUT_GRANT"
+  # Your CPI name
+  sas_cpi_name: "ONF_CPI"
+  # Your CPI Certification ID
+  sas_cpi_id: "GOOG-999999"
+  # Device antenna parameters
+  sas_antenna_azimuth: 0
+  sas_antenna_downtilt: 0
+  sas_antenna_gain: 5
+  sas_antenna_beamwidth: 360
+  # The signature of configuration
+  sas_cpi_signature_data: "ENODEBD_CONFIGURED_CPI_SIGNED_DATA"