diff --git a/firmware/ZigbeeNodeControlBridge_JN5168_FULL_FUNC_DEVICE_115200.bin b/firmware/ZigbeeNodeControlBridge_JN5168_FULL_FUNC_DEVICE_115200.bin
deleted file mode 100644
index 1672914..0000000
Binary files a/firmware/ZigbeeNodeControlBridge_JN5168_FULL_FUNC_DEVICE_115200.bin and /dev/null differ
diff --git a/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_FULL_FUNC_DEVICE_115200.bin b/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_FULL_FUNC_DEVICE_115200.bin
deleted file mode 100755
index ad9d970..0000000
Binary files a/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_FULL_FUNC_DEVICE_115200.bin and /dev/null differ
diff --git a/firmware/ZigbeeNodeControlBridge_JN5169_GP_Proxy_COORDINATOR_115200.bin b/firmware/ZigbeeNodeControlBridge_JN5169_GP_Proxy_COORDINATOR_115200.bin
deleted file mode 100755
index 8f98700..0000000
Binary files a/firmware/ZigbeeNodeControlBridge_JN5169_GP_Proxy_COORDINATOR_115200.bin and /dev/null differ
diff --git a/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_COORDINATOR_115200.bin b/firmware/nymea-zigbee-3-control-bridge-JN5168-1011-1840-green-power-proxy-coordinator-115200.bin
similarity index 72%
rename from firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_COORDINATOR_115200.bin
rename to firmware/nymea-zigbee-3-control-bridge-JN5168-1011-1840-green-power-proxy-coordinator-115200.bin
index ad9d970..3ec40c5 100755
Binary files a/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_COORDINATOR_115200.bin and b/firmware/nymea-zigbee-3-control-bridge-JN5168-1011-1840-green-power-proxy-coordinator-115200.bin differ
diff --git a/firmware/nymea-zigbee-3-control-bridge-JN5168-1011-1840-green-power-proxy-full-functional-device-115200.bin b/firmware/nymea-zigbee-3-control-bridge-JN5168-1011-1840-green-power-proxy-full-functional-device-115200.bin
new file mode 100755
index 0000000..bc53efd
Binary files /dev/null and b/firmware/nymea-zigbee-3-control-bridge-JN5168-1011-1840-green-power-proxy-full-functional-device-115200.bin differ
diff --git a/firmware/ZigbeeNodeControlBridge_JN5169_GP_Proxy_FULL_FUNC_DEVICE_115200.bin b/firmware/nymea-zigbee-3-control-bridge-JN5169-1011-1840-green-power-proxy-coordinator-115200.bin
similarity index 72%
rename from firmware/ZigbeeNodeControlBridge_JN5169_GP_Proxy_FULL_FUNC_DEVICE_115200.bin
rename to firmware/nymea-zigbee-3-control-bridge-JN5169-1011-1840-green-power-proxy-coordinator-115200.bin
index 8f98700..5c434c9 100755
Binary files a/firmware/ZigbeeNodeControlBridge_JN5169_GP_Proxy_FULL_FUNC_DEVICE_115200.bin and b/firmware/nymea-zigbee-3-control-bridge-JN5169-1011-1840-green-power-proxy-coordinator-115200.bin differ
diff --git a/firmware/nymea-zigbee-3-control-bridge-JN5169-1011-1840-green-power-proxy-full-functional-device-115200.bin b/firmware/nymea-zigbee-3-control-bridge-JN5169-1011-1840-green-power-proxy-full-functional-device-115200.bin
new file mode 100755
index 0000000..878c027
Binary files /dev/null and b/firmware/nymea-zigbee-3-control-bridge-JN5169-1011-1840-green-power-proxy-full-functional-device-115200.bin differ
diff --git a/firmware/nymea-zigbee-ha-zll-control-bridge-JN5168-1014.1620.bin b/firmware/nymea-zigbee-ha-zll-control-bridge-JN5168-1014.1620.bin
deleted file mode 100755
index 908538b..0000000
Binary files a/firmware/nymea-zigbee-ha-zll-control-bridge-JN5168-1014.1620.bin and /dev/null differ
diff --git a/firmware/nymea-zigbee-ha-zll-control-bridge-JN5169-1014.1620.bin b/firmware/nymea-zigbee-ha-zll-control-bridge-JN5169-1014.1620.bin
deleted file mode 100755
index e146057..0000000
Binary files a/firmware/nymea-zigbee-ha-zll-control-bridge-JN5169-1014.1620.bin and /dev/null differ