diff --git a/firmware/targets/f7/ble_glue/services/dev_info_service.c b/firmware/targets/f7/ble_glue/services/dev_info_service.c
index fa7b9c2d587..e38d42f89c5 100644
--- a/firmware/targets/f7/ble_glue/services/dev_info_service.c
+++ b/firmware/targets/f7/ble_glue/services/dev_info_service.c
@@ -14,9 +14,9 @@
 typedef enum {
     DevInfoSvcGattCharacteristicMfgName = 0,
     DevInfoSvcGattCharacteristicSerial,
-    DevInfoSvcGattCharacteristicFirmwareRev,
-    DevInfoSvcGattCharacteristicSoftwareRev,
-    DevInfoSvcGattCharacteristicRpcVersion,
+    // DevInfoSvcGattCharacteristicFirmwareRev,
+    // DevInfoSvcGattCharacteristicSoftwareRev,
+    // DevInfoSvcGattCharacteristicRpcVersion,
     DevInfoSvcGattCharacteristicCount,
 } DevInfoSvcGattCharacteristicId;
 
@@ -26,6 +26,11 @@ typedef struct {
     FlipperGattCharacteristicInstance characteristics[DevInfoSvcGattCharacteristicCount];
     FuriString* version_string;
     char hardware_revision[DEVICE_INFO_HARDWARE_REV_SIZE];
+    uint16_t man_name_char_handle;
+    uint16_t serial_num_char_handle;
+    uint16_t firmware_rev_char_handle;
+    uint16_t software_rev_char_handle;
+    uint16_t rpc_version_char_handle;
 } DevInfoSvc;
 
 static DevInfoSvc* dev_info_svc = NULL;
@@ -58,62 +63,64 @@ static bool dev_info_char_software_rev_callback(
     return false;
 }
 
-static const FlipperGattCharacteristicParams dev_info_svc_chars[DevInfoSvcGattCharacteristicCount] =
-    {[DevInfoSvcGattCharacteristicMfgName] =
-         {.name = "Manufacturer Name",
-          .data_prop_type = FlipperGattCharacteristicDataFixed,
-          .data.fixed.length = sizeof(dev_info_man_name) - 1,
-          .data.fixed.ptr = (const uint8_t*)&dev_info_man_name,
-          .uuid.Char_UUID_16 = MANUFACTURER_NAME_UUID,
-          .uuid_type = UUID_TYPE_16,
-          .char_properties = CHAR_PROP_READ,
-          .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
-          .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
-          .is_variable = CHAR_VALUE_LEN_CONSTANT},
-     [DevInfoSvcGattCharacteristicSerial] =
-         {.name = "Serial Number",
-          .data_prop_type = FlipperGattCharacteristicDataFixed,
-          .data.fixed.length = sizeof(dev_info_serial_num) - 1,
-          .data.fixed.ptr = (const uint8_t*)&dev_info_serial_num,
-          .uuid.Char_UUID_16 = SERIAL_NUMBER_UUID,
-          .uuid_type = UUID_TYPE_16,
-          .char_properties = CHAR_PROP_READ,
-          .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
-          .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
-          .is_variable = CHAR_VALUE_LEN_CONSTANT},
-     [DevInfoSvcGattCharacteristicFirmwareRev] =
-         {.name = "Firmware Revision",
-          .data_prop_type = FlipperGattCharacteristicDataCallback,
-          .data.callback.context = &dev_info_svc,
-          .data.callback.fn = dev_info_char_firmware_rev_callback,
-          .uuid.Char_UUID_16 = FIRMWARE_REVISION_UUID,
-          .uuid_type = UUID_TYPE_16,
-          .char_properties = CHAR_PROP_READ,
-          .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
-          .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
-          .is_variable = CHAR_VALUE_LEN_CONSTANT},
-     [DevInfoSvcGattCharacteristicSoftwareRev] =
-         {.name = "Software Revision",
-          .data_prop_type = FlipperGattCharacteristicDataCallback,
-          .data.callback.context = &dev_info_svc,
-          .data.callback.fn = dev_info_char_software_rev_callback,
-          .uuid.Char_UUID_16 = SOFTWARE_REVISION_UUID,
-          .uuid_type = UUID_TYPE_16,
-          .char_properties = CHAR_PROP_READ,
-          .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
-          .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
-          .is_variable = CHAR_VALUE_LEN_CONSTANT},
-     [DevInfoSvcGattCharacteristicRpcVersion] = {
-         .name = "RPC Version",
-         .data_prop_type = FlipperGattCharacteristicDataFixed,
-         .data.fixed.length = sizeof(dev_info_rpc_version) - 1,
-         .data.fixed.ptr = (const uint8_t*)&dev_info_rpc_version,
-         .uuid.Char_UUID_128 = DEV_INVO_RPC_VERSION_UID,
-         .uuid_type = UUID_TYPE_128,
-         .char_properties = CHAR_PROP_READ,
-         .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
-         .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
-         .is_variable = CHAR_VALUE_LEN_CONSTANT}};
+static const FlipperGattCharacteristicParams
+    dev_info_svc_chars[DevInfoSvcGattCharacteristicCount] = {
+        [DevInfoSvcGattCharacteristicMfgName] =
+            {.name = "Manufacturer Name",
+             .data_prop_type = FlipperGattCharacteristicDataFixed,
+             .data.fixed.length = sizeof(dev_info_man_name) - 1,
+             .data.fixed.ptr = (const uint8_t*)&dev_info_man_name,
+             .uuid.Char_UUID_16 = MANUFACTURER_NAME_UUID,
+             .uuid_type = UUID_TYPE_16,
+             .char_properties = CHAR_PROP_READ,
+             .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
+             .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
+             .is_variable = CHAR_VALUE_LEN_CONSTANT},
+        [DevInfoSvcGattCharacteristicSerial] =
+            {.name = "Serial Number",
+             .data_prop_type = FlipperGattCharacteristicDataFixed,
+             .data.fixed.length = sizeof(dev_info_serial_num) - 1,
+             .data.fixed.ptr = (const uint8_t*)&dev_info_serial_num,
+             .uuid.Char_UUID_16 = SERIAL_NUMBER_UUID,
+             .uuid_type = UUID_TYPE_16,
+             .char_properties = CHAR_PROP_READ,
+             .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
+             .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
+             .is_variable = CHAR_VALUE_LEN_CONSTANT},
+        //  [DevInfoSvcGattCharacteristicFirmwareRev] =
+        //      {.name = "Firmware Revision",
+        //       .data_prop_type = FlipperGattCharacteristicDataCallback,
+        //       .data.callback.context = &dev_info_svc,
+        //       .data.callback.fn = dev_info_char_firmware_rev_callback,
+        //       .uuid.Char_UUID_16 = FIRMWARE_REVISION_UUID,
+        //       .uuid_type = UUID_TYPE_16,
+        //       .char_properties = CHAR_PROP_READ,
+        //       .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
+        //       .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
+        //       .is_variable = CHAR_VALUE_LEN_CONSTANT},
+        //  [DevInfoSvcGattCharacteristicSoftwareRev] =
+        //      {.name = "Software Revision",
+        //       .data_prop_type = FlipperGattCharacteristicDataCallback,
+        //       .data.callback.context = &dev_info_svc,
+        //       .data.callback.fn = dev_info_char_software_rev_callback,
+        //       .uuid.Char_UUID_16 = SOFTWARE_REVISION_UUID,
+        //       .uuid_type = UUID_TYPE_16,
+        //       .char_properties = CHAR_PROP_READ,
+        //       .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
+        //       .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
+        //       .is_variable = CHAR_VALUE_LEN_CONSTANT},
+        //  [DevInfoSvcGattCharacteristicRpcVersion] = {
+        //      .name = "RPC Version",
+        //      .data_prop_type = FlipperGattCharacteristicDataFixed,
+        //      .data.fixed.length = sizeof(dev_info_rpc_version) - 1,
+        //      .data.fixed.ptr = (const uint8_t*)&dev_info_rpc_version,
+        //      .uuid.Char_UUID_128 = DEV_INVO_RPC_VERSION_UID,
+        //      .uuid_type = UUID_TYPE_128,
+        //      .char_properties = CHAR_PROP_READ,
+        //      .security_permissions = ATTR_PERMISSION_AUTHEN_READ,
+        //      .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
+        //      .is_variable = CHAR_VALUE_LEN_CONSTANT},
+};
 
 void dev_info_svc_start() {
     dev_info_svc = malloc(sizeof(DevInfoSvc));
@@ -148,10 +155,88 @@ void dev_info_svc_start() {
             &dev_info_svc_chars[i],
             &dev_info_svc->characteristics[i]);
     }
+
+    UNUSED(dev_info_char_software_rev_callback);
+    UNUSED(dev_info_char_firmware_rev_callback);
+
+    uuid = FIRMWARE_REVISION_UUID;
+    status = aci_gatt_add_char(
+        dev_info_svc->service_handle,
+        UUID_TYPE_16,
+        (Char_UUID_t*)&uuid,
+        strlen(dev_info_svc->hardware_revision),
+        CHAR_PROP_READ,
+        ATTR_PERMISSION_AUTHEN_READ,
+        GATT_DONT_NOTIFY_EVENTS,
+        10,
+        CHAR_VALUE_LEN_CONSTANT,
+        &dev_info_svc->firmware_rev_char_handle);
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to add firmware revision char: %d", status);
+    }
+    uuid = SOFTWARE_REVISION_UUID;
+    status = aci_gatt_add_char(
+        dev_info_svc->service_handle,
+        UUID_TYPE_16,
+        (Char_UUID_t*)&uuid,
+        furi_string_size(dev_info_svc->version_string),
+        CHAR_PROP_READ,
+        ATTR_PERMISSION_AUTHEN_READ,
+        GATT_DONT_NOTIFY_EVENTS,
+        10,
+        CHAR_VALUE_LEN_CONSTANT,
+        &dev_info_svc->software_rev_char_handle);
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to add software revision char: %d", status);
+    }
+
+    static const uint8_t dev_info_rpc_version_uuid[] = DEV_INVO_RPC_VERSION_UID;
+    status = aci_gatt_add_char(
+        dev_info_svc->service_handle,
+        UUID_TYPE_128,
+        (const Char_UUID_t*)dev_info_rpc_version_uuid,
+        strlen(dev_info_rpc_version),
+        CHAR_PROP_READ,
+        ATTR_PERMISSION_AUTHEN_READ,
+        GATT_DONT_NOTIFY_EVENTS,
+        10,
+        CHAR_VALUE_LEN_CONSTANT,
+        &dev_info_svc->rpc_version_char_handle);
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to add rpc version characteristic: %d", status);
+    }
+
     for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
         flipper_gatt_characteristic_update(
             dev_info_svc->service_handle, &dev_info_svc->characteristics[i], NULL);
     }
+    status = aci_gatt_update_char_value(
+        dev_info_svc->service_handle,
+        dev_info_svc->firmware_rev_char_handle,
+        0,
+        strlen(dev_info_svc->hardware_revision),
+        (uint8_t*)dev_info_svc->hardware_revision);
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to update firmware revision char: %d", status);
+    }
+    status = aci_gatt_update_char_value(
+        dev_info_svc->service_handle,
+        dev_info_svc->software_rev_char_handle,
+        0,
+        furi_string_size(dev_info_svc->version_string),
+        (uint8_t*)furi_string_get_cstr(dev_info_svc->version_string));
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to update software revision char: %d", status);
+    }
+    status = aci_gatt_update_char_value(
+        dev_info_svc->service_handle,
+        dev_info_svc->rpc_version_char_handle,
+        0,
+        strlen(dev_info_rpc_version),
+        (uint8_t*)dev_info_rpc_version);
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to update rpc version char: %d", status);
+    }
 }
 
 void dev_info_svc_stop() {
@@ -163,6 +248,22 @@ void dev_info_svc_stop() {
             flipper_gatt_characteristic_delete(
                 dev_info_svc->service_handle, &dev_info_svc->characteristics[i]);
         }
+
+        status = aci_gatt_del_char(
+            dev_info_svc->service_handle, dev_info_svc->firmware_rev_char_handle);
+        if(status) {
+            FURI_LOG_E(TAG, "Failed to delete firmware revision char: %d", status);
+        }
+        status = aci_gatt_del_char(
+            dev_info_svc->service_handle, dev_info_svc->software_rev_char_handle);
+        if(status) {
+            FURI_LOG_E(TAG, "Failed to delete software revision char: %d", status);
+        }
+        status =
+            aci_gatt_del_char(dev_info_svc->service_handle, dev_info_svc->rpc_version_char_handle);
+        if(status) {
+            FURI_LOG_E(TAG, "Failed to delete rpc version char: %d", status);
+        }
         // Delete service
         status = aci_gatt_del_service(dev_info_svc->service_handle);
         if(status) {