diff --git a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
index 4836c62..5e3285a 100644
--- a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
+++ b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
@@ -84,8 +84,12 @@ bool resumeFight = false;
 //------------------------------------------------------------------------------------
 // ESP-NOW config
 // send config, Clock:
-uint8_t broadcastAddressClock1[] = {0x48, 0x27, 0xE2, 0x5D, 0xB6, 0x84};
-uint8_t broadcastAddressClock2[] = {0x48, 0x27, 0xE2, 0x5D, 0xB6, 0x84};
+// A Arena
+//uint8_t broadcastAddressClock1[] = {0x48, 0x27, 0xE2, 0x5D, 0xB6, 0x84};
+//uint8_t broadcastAddressClock2[] = {0xD8, 0x3B, 0xDA, 0xC8, 0x95, 0x42};
+// B Arena
+uint8_t broadcastAddressClock1[] = {0xD8, 0x3B, 0xDA, 0xC9, 0x49, 0xC6};
+uint8_t broadcastAddressClock2[] = {0xD8, 0x3B, 0xDA, 0xC8, 0xFF, 0xFA};
 // struct for clock data
 typedef struct struct_message_Clock {
   int sendMinutes;
@@ -100,8 +104,12 @@ typedef struct struct_message_Clock {
 struct_message_Clock sendClockDATA;
 
 // send config, pilot buttons:
-uint8_t broadcastAddressREDTEAMbutton[] = {0x84, 0xFC, 0xE6, 0xC7, 0x23, 0x14};
-uint8_t broadcastAddressBLUETEAMbutton[] = {0x84, 0xFC, 0xE6, 0xC7, 0x1A, 0x02};
+// A Arena
+//uint8_t broadcastAddressREDTEAMbutton[] = {0x84, 0xFC, 0xE6, 0xC7, 0x23, 0x14};
+//uint8_t broadcastAddressBLUETEAMbutton[] = {0x84, 0xFC, 0xE6, 0xC7, 0x1A, 0x02};
+// B Arena
+uint8_t broadcastAddressREDTEAMbutton[] = {0xD8, 0x3B, 0xDA, 0xC8, 0x95, 0x58};
+uint8_t broadcastAddressBLUETEAMbutton[] = {0xD8, 0x3B, 0xDA, 0xC8, 0x95, 0x1C};
 
 // Structure for sending data
 typedef struct struct_message_send {
@@ -113,7 +121,10 @@ struct_message_send sendToREDTEAMbutton;
 struct_message_send sendToBLUETEAMbutton;
 
 // ESP-Now stuff for the Pit controller
-uint8_t broadcastAddressPitController[] = {0x84, 0xFC, 0xE6, 0xC7, 0x19, 0xDE};
+// A Arena
+//uint8_t broadcastAddressPitController[] = {0x84, 0xFC, 0xE6, 0xC7, 0x19, 0xDE};
+// B Arena
+uint8_t broadcastAddressPitController[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xB0, 0x0B};
 // Structure for sending data
 typedef struct struct_message_pit {
   bool PIT; // LED state
diff --git a/ROFLS_Arena_Remote/ROFLS_Arena_Remote.ino b/ROFLS_Arena_Remote/ROFLS_Arena_Remote.ino
index af89ff5..d1b41dd 100644
--- a/ROFLS_Arena_Remote/ROFLS_Arena_Remote.ino
+++ b/ROFLS_Arena_Remote/ROFLS_Arena_Remote.ino
@@ -46,7 +46,10 @@ bool sendDATAvar = false;
 // ESP-NOW config
 
 // REPLACE WITH YOUR RECEIVER MAC Address
-uint8_t broadcastAddress[] = {0x84, 0xFC, 0xE6, 0xC7, 0x1A, 0x8C};
+// A Arena
+//uint8_t broadcastAddress[] = {0x84, 0xFC, 0xE6, 0xC7, 0x1A, 0x8C};
+// B Arena
+uint8_t broadcastAddress[] = {0xD8, 0x3B, 0xDA, 0xC9, 0x0C, 0xEE};
 
 // Structure example to send data
 // Must match the receiver structure