diff --git a/.gitmodules b/.gitmodules
index f7ed642165..2e7d0f4d42 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "vendor/nimbus-build-system"]
 	path = vendor/nimbus-build-system
 	url = https://github.com/status-im/nimbus-build-system.git
-[submodule "vendor/status-go"]
-	path = vendor/status-go
-	url = https://github.com/status-im/status-go.git
 [submodule "vendor/DOtherSide"]
 	path = vendor/DOtherSide
 	url = https://github.com/status-im/DOtherSide.git
diff --git a/Makefile b/Makefile
index bfcebf65ce..6655a20047 100644
--- a/Makefile
+++ b/Makefile
@@ -207,14 +207,14 @@ $(DOTHERSIDE): | deps
 			.. $(HANDLE_OUTPUT) && \
 		$(DOTHERSIDE_BUILD_CMD)
 
-STATUSGO := vendor/status-go/build/bin/libstatus.$(LIBSTATUS_EXT)
+STATUSGO := vendor/status-lib/vendor/status-go/build/bin/libstatus.$(LIBSTATUS_EXT)
 STATUSGO_LIBDIR := $(shell pwd)/$(shell dirname "$(STATUSGO)")
 export STATUSGO_LIBDIR
 
 status-go: $(STATUSGO)
 $(STATUSGO): | deps
 	echo -e $(BUILD_MSG) "status-go"
-	+ cd vendor/status-go && \
+	+ cd vendor/status-lib/vendor/status-go && \
 	  $(MAKE) statusgo-shared-library $(HANDLE_OUTPUT)
 
 QRCODEGEN := vendor/QR-Code-generator/c/libqrcodegen.a
@@ -353,7 +353,7 @@ $(STATUS_CLIENT_APPIMAGE): nim_status_client $(APPIMAGE_TOOL) nim-status.desktop
 	cp -P /usr/lib/x86_64-linux-gnu/libgst* tmp/linux/dist/usr/lib/
 	cp -r /usr/lib/x86_64-linux-gnu/gstreamer-1.0 tmp/linux/dist/usr/lib/
 	cp -r /usr/lib/x86_64-linux-gnu/gstreamer1.0 tmp/linux/dist/usr/lib/
-	cp vendor/status-go/build/bin/libstatus.so tmp/linux/dist/usr/lib/
+	cp vendor/status-lib/vendor/status-go/build/bin/libstatus.so tmp/linux/dist/usr/lib/
 
 	echo -e $(BUILD_MSG) "AppImage"
 	linuxdeployqt tmp/linux/dist/nim-status.desktop -no-copy-copyright-files -qmldir=ui -qmlimport=$(QTDIR)/qml -bundle-non-qt-libs
diff --git a/vendor/status-go b/vendor/status-go
deleted file mode 160000
index 33e0611d64..0000000000
--- a/vendor/status-go
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33e0611d6431536122c315161e6896baae55ea67
diff --git a/vendor/status-lib b/vendor/status-lib
index 62a7c02153..cf2a43f9b3 160000
--- a/vendor/status-lib
+++ b/vendor/status-lib
@@ -1 +1 @@
-Subproject commit 62a7c021535d6466702139192f212136d40c658f
+Subproject commit cf2a43f9b31da1862699bb5538d54a0e91a25ec5