diff --git a/components/service/crypto/provider/crypto_provider.c b/components/service/crypto/provider/crypto_provider.c
index 394f493..89fc86d 100644
--- a/components/service/crypto/provider/crypto_provider.c
+++ b/components/service/crypto/provider/crypto_provider.c
@@ -11,7 +11,6 @@
 #include <psa/crypto.h>
 
 /* Service request handlers */
-static rpc_status_t nop_handler(void *context, struct call_req* req);
 static rpc_status_t generate_key_handler(void *context, struct call_req* req);
 static rpc_status_t destroy_key_handler(void *context, struct call_req* req);
 static rpc_status_t export_key_handler(void *context, struct call_req* req);
@@ -28,7 +27,6 @@
 
 /* Handler mapping table for service */
 static const struct service_handler handler_table[] = {
-	{TS_CRYPTO_OPCODE_NOP,                  nop_handler},
 	{TS_CRYPTO_OPCODE_GENERATE_KEY,         generate_key_handler},
 	{TS_CRYPTO_OPCODE_DESTROY_KEY,          destroy_key_handler},
 	{TS_CRYPTO_OPCODE_EXPORT_KEY,           export_key_handler},
@@ -85,18 +83,6 @@
 	return serializer;
 }
 
-static rpc_status_t nop_handler(void *context, struct call_req* req)
-{
-	/* Responds to a request by returning success */
-	rpc_status_t rpc_status = TS_RPC_CALL_ACCEPTED;
-	psa_status_t psa_status = PSA_SUCCESS;
-
-	(void)context;
-	call_req_set_opstatus(req, psa_status);
-
-	return rpc_status;
-}
-
 static rpc_status_t generate_key_handler(void *context, struct call_req* req)
 {
 	rpc_status_t rpc_status = TS_RPC_ERROR_SERIALIZATION_NOT_SUPPORTED;
diff --git a/components/service/discovery/provider/component.cmake b/components/service/discovery/provider/component.cmake
new file mode 100644
index 0000000..85dfa85
--- /dev/null
+++ b/components/service/discovery/provider/component.cmake
@@ -0,0 +1,13 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+if (NOT DEFINED TGT)
+	message(FATAL_ERROR "mandatory parameter TGT is not defined.")
+endif()
+
+target_sources(${TGT} PRIVATE
+	"${CMAKE_CURRENT_LIST_DIR}/discovery_provider.c"
+	)
diff --git a/components/service/discovery/provider/discovery_info.h b/components/service/discovery/provider/discovery_info.h
new file mode 100644
index 0000000..33ef5c9
--- /dev/null
+++ b/components/service/discovery/provider/discovery_info.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef DISCOVERY_INFO_H
+#define DISCOVERY_INFO_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Information about the service deployment.
+ */
+struct discovery_deployment_info
+{
+	uint16_t interface_id;
+	uint16_t instance;
+	uint32_t max_req_size;
+};
+
+/**
+ * Information about service identity
+ */
+struct discovery_identity_info
+{
+	const char *name_authority;
+	const char *service_name;
+};
+
+/**
+ * Aggregate of all discovery info
+ */
+struct discovery_info
+{
+	struct discovery_deployment_info deployment;
+	struct discovery_identity_info identity;
+
+	uint32_t supported_encodings;
+};
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* DISCOVERY_INFO_H */
diff --git a/components/service/discovery/provider/discovery_provider.c b/components/service/discovery/provider/discovery_provider.c
new file mode 100644
index 0000000..d32e8f5
--- /dev/null
+++ b/components/service/discovery/provider/discovery_provider.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stddef.h>
+#include <protocols/service/discovery/packed-c/opcodes.h>
+#include <service/discovery/provider/discovery_provider.h>
+#include <protocols/rpc/common/packed-c/status.h>
+#include <psa/error.h>
+
+/* Service request handlers */
+static rpc_status_t get_service_info_handler(void *context, struct call_req* req);
+static rpc_status_t get_provider_info_handler(void *context, struct call_req* req);
+static rpc_status_t get_service_caps_handler(void *context, struct call_req* req);
+
+/* Handler mapping table for service */
+static const struct service_handler handler_table[] = {
+	{TS_DISCOVERY_OPCODE_GET_SERVICE_INFO,          get_service_info_handler},
+	{TS_DISCOVERY_OPCODE_GET_PROVIDER_INFO,         get_provider_info_handler},
+	{TS_DISCOVERY_OPCODE_GET_SERVICE_CAPS,          get_service_caps_handler}
+};
+
+
+struct rpc_interface *discovery_provider_init(
+	struct discovery_provider *context,
+	const struct discovery_deployment_info *deployment_info,
+	const struct discovery_identity_info *identity_info)
+{
+	for (size_t encoding = 0; encoding < TS_RPC_ENCODING_LIMIT; ++encoding)
+		context->serializers[encoding] = NULL;
+
+	service_provider_init(&context->base_provider, context,
+					handler_table, sizeof(handler_table)/sizeof(struct service_handler));
+
+	context->info.deployment = *deployment_info;
+	context->info.identity = *identity_info;
+
+	context->info.supported_encodings = 0;
+
+	return service_provider_get_rpc_interface(&context->base_provider);
+}
+
+void discovery_provider_deinit(struct discovery_provider *context)
+{
+	(void)context;
+}
+
+void discovery_provider_register_serializer(struct discovery_provider *context,
+				unsigned int encoding, const struct discovery_provider_serializer *serializer)
+{
+	if (encoding < TS_RPC_ENCODING_LIMIT)
+		context->serializers[encoding] = serializer;
+}
+
+void discovery_provider_register_supported_encoding(
+	struct discovery_provider *context,
+	unsigned int encoding)
+{
+	context->info.supported_encodings |= (1U << encoding);
+}
+
+static const struct discovery_provider_serializer* get_discovery_serializer(void *context,
+														const struct call_req *req)
+{
+	struct discovery_provider *this_instance = (struct discovery_provider*)context;
+	const struct discovery_provider_serializer* serializer = NULL;
+	unsigned int encoding = call_req_get_encoding(req);
+
+	if (encoding < TS_RPC_ENCODING_LIMIT) serializer = this_instance->serializers[encoding];
+
+	return serializer;
+}
+
+static rpc_status_t get_service_info_handler(void *context, struct call_req* req)
+{
+	struct discovery_provider *this_instance = (struct discovery_provider*)context;
+	rpc_status_t rpc_status = TS_RPC_ERROR_SERIALIZATION_NOT_SUPPORTED;
+	const struct discovery_provider_serializer *serializer = get_discovery_serializer(context, req);
+
+	if (serializer) {
+
+		struct call_param_buf *resp_buf = call_req_get_resp_buf(req);
+
+		rpc_status = serializer->serialize_get_service_info_resp(resp_buf, &this_instance->info);
+		call_req_set_opstatus(req, PSA_SUCCESS);
+	}
+
+	return rpc_status;
+}
+
+static rpc_status_t get_provider_info_handler(void *context, struct call_req* req)
+{
+	(void)context;
+	(void)req;
+	call_req_set_opstatus(req, PSA_ERROR_NOT_SUPPORTED);
+	return TS_RPC_CALL_ACCEPTED;
+}
+
+static rpc_status_t get_service_caps_handler(void *context, struct call_req* req)
+{
+	(void)context;
+	(void)req;
+	call_req_set_opstatus(req, PSA_ERROR_NOT_SUPPORTED);
+	return TS_RPC_CALL_ACCEPTED;
+}
diff --git a/components/service/discovery/provider/discovery_provider.h b/components/service/discovery/provider/discovery_provider.h
new file mode 100644
index 0000000..f2b3ccf
--- /dev/null
+++ b/components/service/discovery/provider/discovery_provider.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef DISCOVERY_PROVIDER_H
+#define DISCOVERY_PROVIDER_H
+
+#include <stdint.h>
+#include <rpc/common/endpoint/rpc_interface.h>
+#include <service/common/provider/service_provider.h>
+#include <service/discovery/provider/serializer/discovery_provider_serializer.h>
+#include <service/discovery/provider/discovery_info.h>
+#include <protocols/rpc/common/packed-c/encoding.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Instance data for a discover_provider object.
+ */
+struct discovery_provider
+{
+	struct service_provider base_provider;
+	const struct discovery_provider_serializer *serializers[TS_RPC_ENCODING_LIMIT];
+
+	struct discovery_info info;
+};
+
+/**
+ * Initializes an instance of the discovery service provider.
+ */
+struct rpc_interface *discovery_provider_init(
+	struct discovery_provider *context,
+	const struct discovery_deployment_info *deployment_info,
+	const struct discovery_identity_info *identity_info);
+
+/**
+ * When operation of the provider is no longer required, this function
+ * frees any resource used by the previously initialized provider instance.
+ */
+void discovery_provider_deinit(
+	struct discovery_provider *context);
+
+/**
+ * Register a serializer for supportng a particular parameter encoding.
+ */
+void discovery_provider_register_serializer(
+	struct discovery_provider *context,
+	unsigned int encoding,
+	const struct discovery_provider_serializer *serializer);
+
+/**
+ * Register a supported protocol encoding for the service provider that
+ * this discovery provider represents.
+ */
+void discovery_provider_register_supported_encoding(
+	struct discovery_provider *context,
+	unsigned int encoding);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* DISCOVERY_PROVIDER_H */
diff --git a/components/service/discovery/provider/serializer/discovery_provider_serializer.h b/components/service/discovery/provider/serializer/discovery_provider_serializer.h
new file mode 100644
index 0000000..643bab1
--- /dev/null
+++ b/components/service/discovery/provider/serializer/discovery_provider_serializer.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef DISCOVERY_PROVIDER_SERIALIZER_H
+#define DISCOVERY_PROVIDER_SERIALIZER_H
+
+#include <service/discovery/provider/discovery_info.h>
+#include <rpc/common/endpoint/rpc_interface.h>
+
+/* Provides a common interface for parameter serialization operations
+ * for the discovery service provider.  Allows alternative serialization
+ * protocols to be used without hard-wiring a particular protocol
+ * into the service provider code.  A concrete serializer must
+ * implement this interface.
+ */
+struct discovery_provider_serializer {
+
+	/* Operation: get_service_info */
+	rpc_status_t (*serialize_get_service_info_resp)(struct call_param_buf *resp_buf,
+		const struct discovery_info *info);
+};
+
+#endif /* DISCOVERY_PROVIDER_SERIALIZER_H */
diff --git a/components/service/discovery/provider/serializer/packed-c/component.cmake b/components/service/discovery/provider/serializer/packed-c/component.cmake
new file mode 100644
index 0000000..319f062
--- /dev/null
+++ b/components/service/discovery/provider/serializer/packed-c/component.cmake
@@ -0,0 +1,13 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+if (NOT DEFINED TGT)
+	message(FATAL_ERROR "mandatory parameter TGT is not defined.")
+endif()
+
+target_sources(${TGT} PRIVATE
+	"${CMAKE_CURRENT_LIST_DIR}/packedc_discovery_provider_serializer.c"
+	)
diff --git a/components/service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.c b/components/service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.c
new file mode 100644
index 0000000..69362f9
--- /dev/null
+++ b/components/service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <common/tlv/tlv.h>
+#include <protocols/rpc/common/packed-c/status.h>
+#include <protocols/service/discovery/packed-c/get_service_info.h>
+#include "packedc_discovery_provider_serializer.h"
+
+/* Operation: get_service_info */
+static rpc_status_t serialize_get_service_info_resp(struct call_param_buf *resp_buf,
+	const struct discovery_info *info)
+{
+	rpc_status_t rpc_status = TS_RPC_ERROR_INTERNAL;
+	struct ts_discovery_get_service_info_out resp_msg;
+	size_t fixed_len = sizeof(struct ts_discovery_get_service_info_out);
+
+	resp_msg.instance = info->deployment.instance;
+	resp_msg.interface_id = info->deployment.interface_id;
+	resp_msg.max_req_size = info->deployment.max_req_size;
+	resp_msg.supported_encodings = info->supported_encodings;
+
+	if (fixed_len <= resp_buf->size) {
+
+		struct tlv_record out_record;
+		struct tlv_iterator resp_iter;
+		int encoded_tlv_count = 0;
+
+		memcpy(resp_buf->data, &resp_msg, fixed_len);
+		resp_buf->data_len = fixed_len;
+
+		tlv_iterator_begin(&resp_iter,
+			(uint8_t*)resp_buf->data + fixed_len,
+			resp_buf->size - fixed_len);
+
+		out_record.tag = TS_DISOVERY_GET_SERVICE_INFO_OUT_TAG_NAME_AUTHORITY;
+		out_record.length = strlen(info->identity.name_authority) + 1;
+		out_record.value = info->identity.name_authority;
+
+		if (tlv_encode(&resp_iter, &out_record)) {
+
+			resp_buf->data_len += tlv_required_space(out_record.length);
+			++encoded_tlv_count;
+		}
+
+		out_record.tag = TS_DISOVERY_GET_SERVICE_INFO_OUT_TAG_SERVICE_NAME;
+		out_record.length = strlen(info->identity.service_name) + 1;
+		out_record.value = info->identity.service_name;
+
+		if (tlv_encode(&resp_iter, &out_record)) {
+
+			resp_buf->data_len += tlv_required_space(out_record.length);
+			++encoded_tlv_count;
+		}
+
+		/* Check that expected TLV records have been encoded */
+		if (encoded_tlv_count == 2) rpc_status = TS_RPC_CALL_ACCEPTED;
+	}
+
+	return rpc_status;
+}
+
+/* Singleton method to provide access to the serializer instance */
+const struct discovery_provider_serializer *packedc_discovery_provider_serializer_instance(void)
+{
+	static const struct discovery_provider_serializer instance =
+	{
+		serialize_get_service_info_resp
+	};
+
+	return &instance;
+}
diff --git a/components/service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.h b/components/service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.h
new file mode 100644
index 0000000..8bfd68a
--- /dev/null
+++ b/components/service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef PACKEDC_DISCOVERY_PROVIDER_SERIALIZER_H
+#define PACKEDC_DISCOVERY_PROVIDER_SERIALIZER_H
+
+#include <service/discovery/provider/serializer/discovery_provider_serializer.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Singleton method to provide access to the packed-c serializer
+ * for the discovery service provider.
+ */
+const struct discovery_provider_serializer *packedc_discovery_provider_serializer_instance(void);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* PACKEDC_DISCOVERY_PROVIDER_SERIALIZER_H */
diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
index 2cfff4c..553b21a 100644
--- a/deployments/component-test/component-test.cmake
+++ b/deployments/component-test/component-test.cmake
@@ -43,6 +43,8 @@
 		"components/service/locator/standalone/services/protected-storage"
 		"components/service/locator/standalone/services/test-runner"
 		"components/service/locator/standalone/services/attestation"
+		"components/service/discovery/provider"
+		"components/service/discovery/provider/serializer/packed-c"
 		"components/service/attestation/include"
 		"components/service/attestation/claims"
 		"components/service/attestation/claims/sources/boot_seed_generator"
diff --git a/protocols/service/attestation/packed-c/opcodes.h b/protocols/service/attestation/packed-c/opcodes.h
index 7bdc6f7..9f039f5 100644
--- a/protocols/service/attestation/packed-c/opcodes.h
+++ b/protocols/service/attestation/packed-c/opcodes.h
@@ -10,13 +10,15 @@
 /* C/C++ definition of attestation service opcodes
  */
 
+#define TS_ATTESTATION_OPCODE_BASE                  (0x0100)
+
 /* Report generation and retrieval operations */
-#define TS_ATTESTATION_OPCODE_GET_TOKEN             (0x0001)
-#define TS_ATTESTATION_OPCODE_GET_TOKEN_SIZE        (0x0002)
+#define TS_ATTESTATION_OPCODE_GET_TOKEN             (TS_ATTESTATION_OPCODE_BASE + 1)
+#define TS_ATTESTATION_OPCODE_GET_TOKEN_SIZE        (TS_ATTESTATION_OPCODE_BASE + 2)
 
 /* Provisioning operations */
-#define TS_ATTESTATION_OPCODE_EXPORT_IAK_PUBLIC_KEY (0x0003)
-#define TS_ATTESTATION_OPCODE_IMPORT_IAK            (0x0004)
-#define TS_ATTESTATION_OPCODE_IAK_EXISTS            (0x0005)
+#define TS_ATTESTATION_OPCODE_EXPORT_IAK_PUBLIC_KEY (TS_ATTESTATION_OPCODE_BASE + 3)
+#define TS_ATTESTATION_OPCODE_IMPORT_IAK            (TS_ATTESTATION_OPCODE_BASE + 4)
+#define TS_ATTESTATION_OPCODE_IAK_EXISTS            (TS_ATTESTATION_OPCODE_BASE + 5)
 
 #endif /* TS_ATTESTATION_OPCODES_H */
diff --git a/protocols/service/crypto/packed-c/opcodes.h b/protocols/service/crypto/packed-c/opcodes.h
index 1890c78..a07bd57 100644
--- a/protocols/service/crypto/packed-c/opcodes.h
+++ b/protocols/service/crypto/packed-c/opcodes.h
@@ -11,7 +11,6 @@
  */
 
 /* Core operations */
-#define TS_CRYPTO_OPCODE_NOP                    (0x0000)
 #define TS_CRYPTO_OPCODE_BASE                   (0x0100)
 #define TS_CRYPTO_OPCODE_GENERATE_KEY           (TS_CRYPTO_OPCODE_BASE + 1)
 #define TS_CRYPTO_OPCODE_DESTROY_KEY            (TS_CRYPTO_OPCODE_BASE + 2)
diff --git a/protocols/service/discovery/packed-c/get_service_info.h b/protocols/service/discovery/packed-c/get_service_info.h
new file mode 100644
index 0000000..bd0e8fd
--- /dev/null
+++ b/protocols/service/discovery/packed-c/get_service_info.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef TS_DISCOVERY_GET_SERVICE_INFO_H
+#define TS_DISCOVERY_GET_SERVICE_INFO_H
+
+#include <stdint.h>
+
+/**
+ * Parameter definitions for the GET_SERVICE_INFO operation.
+ *
+ * Returns information about how to communicate with the service
+ * interface.
+ */
+
+/* Mandatory fixed sized output parameters */
+struct __attribute__ ((__packed__)) ts_discovery_get_service_info_out
+{
+	/* The RPC interface id that should be used to
+	 * communicate with this service provder instance.
+	 */
+	uint16_t interface_id;
+
+	/* The instance number assigned to this service provider.
+	 * Used for identifying a particular instance of a service
+	 * provider within a system that may host multiple instances.
+	 * This instance may be used as a binding by clients and may be
+	 * reflected at the kernel/userspace interface via a device node
+	 * with a particular instance e.g. /dev/tpm0.
+	 */
+	uint16_t instance;
+
+	/* A bitmap of supported access protocol encodings for parameter
+	 * serialization.  A service provider may support 1..* encodings.
+	 */
+	uint32_t supported_encodings;
+
+	/* The maximum supported size for an RPC call request.  This limit
+	 * will be imposed by the underlying RPC layer used by a client
+	 * to call service operations.
+	 */
+	uint32_t max_req_size;
+};
+
+/* Variable length output parameter tags */
+enum
+{
+    /* Identifies the service naming authority e.g 'trustedfirmware.org' */
+    TS_DISOVERY_GET_SERVICE_INFO_OUT_TAG_NAME_AUTHORITY  = 1,
+
+	/* The service name string assigned by the naming authority e.g. 'crypto' */
+	TS_DISOVERY_GET_SERVICE_INFO_OUT_TAG_SERVICE_NAME = 2
+};
+
+#endif /* TS_DISCOVERY_GET_SERVICE_INFO_H */
diff --git a/protocols/service/discovery/packed-c/opcodes.h b/protocols/service/discovery/packed-c/opcodes.h
new file mode 100644
index 0000000..acce2c8
--- /dev/null
+++ b/protocols/service/discovery/packed-c/opcodes.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef TS_DISCOVERY_OPCODES_H
+#define TS_DISCOVERY_OPCODES_H
+
+/**
+ * C/C++ definition of discovery service opcodes.
+ *
+ * Discovery service operations should be callable at all service
+ * endpoints to support service discovery.
+ */
+
+#define TS_DISCOVERY_OPCODE_BASE                 (0x0000)
+#define TS_DISCOVERY_OPCODE_GET_SERVICE_INFO     (TS_DISCOVERY_OPCODE_BASE + 1)
+#define TS_DISCOVERY_OPCODE_GET_PROVIDER_INFO    (TS_DISCOVERY_OPCODE_BASE + 2)
+#define TS_DISCOVERY_OPCODE_GET_SERVICE_CAPS     (TS_DISCOVERY_OPCODE_BASE + 3)
+
+#endif /* TS_DISCOVERY_OPCODES_H */
diff --git a/protocols/service/secure_storage/packed-c/secure_storage_proto.h b/protocols/service/secure_storage/packed-c/secure_storage_proto.h
index 6b2c04a..544fbc3 100644
--- a/protocols/service/secure_storage/packed-c/secure_storage_proto.h
+++ b/protocols/service/secure_storage/packed-c/secure_storage_proto.h
@@ -60,13 +60,15 @@
 	uint32_t support;
 };
 
-#define TS_SECURE_STORAGE_OPCODE_SET			(0u)
-#define TS_SECURE_STORAGE_OPCODE_GET			(1u)
-#define TS_SECURE_STORAGE_OPCODE_GET_INFO		(2u)
-#define TS_SECURE_STORAGE_OPCODE_REMOVE			(3u)
-#define TS_SECURE_STORAGE_OPCODE_CREATE			(4u)
-#define TS_SECURE_STORAGE_OPCODE_SET_EXTENDED	(5u)
-#define TS_SECURE_STORAGE_OPCODE_GET_SUPPORT	(6u)
+#define TS_SECURE_STORAGE_OPCODE_BASE			(0x100u)
+
+#define TS_SECURE_STORAGE_OPCODE_SET			(TS_SECURE_STORAGE_OPCODE_BASE + 0u)
+#define TS_SECURE_STORAGE_OPCODE_GET			(TS_SECURE_STORAGE_OPCODE_BASE + 1u)
+#define TS_SECURE_STORAGE_OPCODE_GET_INFO		(TS_SECURE_STORAGE_OPCODE_BASE + 2u)
+#define TS_SECURE_STORAGE_OPCODE_REMOVE			(TS_SECURE_STORAGE_OPCODE_BASE + 3u)
+#define TS_SECURE_STORAGE_OPCODE_CREATE			(TS_SECURE_STORAGE_OPCODE_BASE + 4u)
+#define TS_SECURE_STORAGE_OPCODE_SET_EXTENDED	(TS_SECURE_STORAGE_OPCODE_BASE + 5u)
+#define TS_SECURE_STORAGE_OPCODE_GET_SUPPORT	(TS_SECURE_STORAGE_OPCODE_BASE + 6u)
 
 #define TS_SECURE_STORAGE_FLAG_NONE			(0u)
 #define TS_SECURE_STORAGE_FLAG_WRITE_ONCE		(1u << 0)
diff --git a/protocols/service/test_runner/packed-c/opcodes.h b/protocols/service/test_runner/packed-c/opcodes.h
index e28da24..5c6ecf0 100644
--- a/protocols/service/test_runner/packed-c/opcodes.h
+++ b/protocols/service/test_runner/packed-c/opcodes.h
@@ -10,7 +10,9 @@
 /**
  *  C/C++ definition of test_runner service opcodes
  */
-#define TS_TEST_RUNNER_OPCODE_RUN_TESTS           (0x0101)
-#define TS_TEST_RUNNER_OPCODE_LIST_TESTS          (0x0102)
+
+#define TS_TEST_RUNNER_OPCODE_BASE              (0x0100)
+#define TS_TEST_RUNNER_OPCODE_RUN_TESTS         (TS_TEST_RUNNER_OPCODE_BASE + 1)
+#define TS_TEST_RUNNER_OPCODE_LIST_TESTS        (TS_TEST_RUNNER_OPCODE_BASE + 2)
 
 #endif /* TS_TEST_RUNNER_OPCODES_H */