diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..7bb66ada9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "rimage"]
+	path = rimage
+	url = https://github.com/thesofproject/rimage.git
+	branch = master
diff --git a/rimage b/rimage
new file mode 160000
index 000000000..f23b2c2d0
--- /dev/null
+++ b/rimage
@@ -0,0 +1 @@
+Subproject commit f23b2c2d07d13b60efe881203d754475b11fbfba
diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt
index ffcb599fa..c299264f2 100644
--- a/src/arch/xtensa/CMakeLists.txt
+++ b/src/arch/xtensa/CMakeLists.txt
@@ -347,13 +347,11 @@ add_custom_target(
 
 ExternalProject_Add(rimage_ep
 	DEPENDS check_version_h
-	DOWNLOAD_COMMAND ""
+	DOWNLOAD_COMMAND git submodule update --init
 	SOURCE_DIR "${PROJECT_SOURCE_DIR}/rimage"
 	PREFIX "${PROJECT_BINARY_DIR}/rimage_ep"
 	BINARY_DIR "${PROJECT_BINARY_DIR}/rimage_ep/build"
 	BUILD_ALWAYS 1
-	CMAKE_ARGS -DVERSION_H_PATH=${VERSION_H_PATH}
-		-DPEM_KEY_PREFIX=${PROJECT_SOURCE_DIR}/rimage/keys
 	INSTALL_COMMAND ""
 )
 
@@ -392,6 +390,8 @@ if(MEU_PATH)
 			-s ${MEU_OFFSET}
 			-k ${RIMAGE_PRIVATE_KEY}
 			-i ${RIMAGE_IMR_TYPE}
+			-f ${SOF_MAJOR}.${SOF_MINOR}
+			-b ${SOF_BUILD}
 			${RIMAGE_MOD_OFFSET_FLAG}
 			${bootloader_binary_path}
 			sof-${fw_name}
@@ -431,6 +431,8 @@ else()
 			-m ${fw_name}
 			-k ${RIMAGE_PRIVATE_KEY}
 			-i ${RIMAGE_IMR_TYPE}
+			-f ${SOF_MAJOR}.${SOF_MINOR}
+			-b ${SOF_BUILD}
 			${RIMAGE_MOD_OFFSET_FLAG}
 			${bootloader_binary_path}
 			sof-${fw_name}