 + * SPDX-License-Identifier: Apache-2.0
 + */
  /*
-  * Generated using zcbor version 0.5.1
+  * Generated using zcbor version 0.6.0
 - * https://github.com/NordicSemiconductor/zcbor
 + * https://github.com/zephyrproject-rtos/zcbor
   * Generated with a --default-max-qty of 99

 int cbor_encode_lwm2m_senml(uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input,
 			    size_t *payload_len_out);
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
index f02b7df151..d8e7d3405a 100644
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
@@ -1,18 +1,33 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /*
  * Generated using zcbor version 0.5.1
- * https://github.com/NordicSemiconductor/zcbor
+ * https://github.com/zephyrproject-rtos/zcbor
  * Generated with a --default-max-qty of 99

+#include "lwm2m_senml_cbor_decode.h"

 static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result);
 static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result);
@@ -47,8 +48,8 @@ static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *re

 	bool tmp_result = ((((zcbor_int32_expect(state, (-3)))) &&
 			    (zcbor_int64_decode(state, (&(*result)._record_bt))) &&
-			    ((((*result)._record_bt >= -9223372036854775807LL) &&
-			      ((*result)._record_bt <= 9223372036854775807LL)) ||
+			    ((((*result)._record_bt >= INT64_MIN) &&
+			      ((*result)._record_bt <= INT64_MAX)) ||
 			     (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));

 	if (!tmp_result)
@@ -76,8 +77,8 @@ static bool decode_repeated_record_t(zcbor_state_t *state, struct record_t *resu

 	bool tmp_result = ((((zcbor_uint32_expect(state, (6)))) &&
 			    (zcbor_int64_decode(state, (&(*result)._record_t))) &&
-			    ((((*result)._record_t >= -9223372036854775807LL) &&
-			      ((*result)._record_t <= 9223372036854775807LL)) ||
+			    ((((*result)._record_t >= INT64_MIN) &&
+			      ((*result)._record_t <= INT64_MAX)) ||
 			     (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));

 	if (!tmp_result)
@@ -94,8 +95,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni
 	bool tmp_result = (((zcbor_union_start_code(state) &&
 			     (int_res = (((((zcbor_uint32_expect_union(state, (2)))) &&
 					   (zcbor_int64_decode(state, (&(*result)._union_vi))) &&
