diff --git a/modules/Kconfig.open-amp b/modules/Kconfig.open-amp
index 10a2a9cfc95..12d389f03a9 100644
--- a/modules/Kconfig.open-amp
+++ b/modules/Kconfig.open-amp
@@ -7,9 +7,25 @@ config OPENAMP
 	help
 	  This option enables the OpenAMP IPC library
 
+if OPENAMP
+
 config OPENAMP_SRC_PATH
 	string "OpenAMP library source path"
 	default "open-amp"
 	depends on OPENAMP
 	help
 	  This option specifies the path to the source for the open-amp library
+
+config OPENAMP_MASTER
+	bool "OpenAMP Master Support"
+	default y
+	help
+	  This option enables support for OpenAMP VirtIO Master
+
+config OPENAMP_SLAVE
+	bool "OpenAMP Slave Support"
+	default y
+	help
+	  This option enables support for OpenAMP VirtIO Slave
+
+endif # OPENAMP
diff --git a/samples/subsys/ipc/openamp/prj.conf b/samples/subsys/ipc/openamp/prj.conf
index d9b869b6033..a2a3c9f8c0d 100644
--- a/samples/subsys/ipc/openamp/prj.conf
+++ b/samples/subsys/ipc/openamp/prj.conf
@@ -4,3 +4,4 @@ CONFIG_TIMESLICE_SIZE=1
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_OPENAMP=y
+CONFIG_OPENAMP_SLAVE=n
diff --git a/samples/subsys/ipc/openamp/remote/prj.conf b/samples/subsys/ipc/openamp/remote/prj.conf
index 9b8ceae532f..e0a369edab3 100644
--- a/samples/subsys/ipc/openamp/remote/prj.conf
+++ b/samples/subsys/ipc/openamp/remote/prj.conf
@@ -5,3 +5,4 @@ CONFIG_PLATFORM_SPECIFIC_INIT=n
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_OPENAMP=y
 CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
+CONFIG_OPENAMP_MASTER=n
diff --git a/west.yml b/west.yml
index 5cb88c1aef1..ee21f111c4d 100644
--- a/west.yml
+++ b/west.yml
@@ -95,7 +95,7 @@ manifest:
       revision: 2f896f74a5fc7220546cc23b50351506cd72ea96
       path: modules/hal/nxp
     - name: open-amp
-      revision: 68c18eae2e619ab161a217b1ce86e7ff37391a15
+      revision: 697716812a38fc05c1689cb9c6768bd412bf7153
       path: modules/lib/open-amp
     - name: loramac-node
       revision: 29e516ec585b1a909af2b5f1c60d83e7d4d563e3