diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..1b86dca7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/addons/volto-form-block"]
+	path = src/addons/volto-form-block
+	url = git@github.com:pretagov/volto-form-block.git
diff --git a/Makefile b/Makefile
index 0ffb7eb4..159cde14 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,14 @@ start-backend-docker:		## Starts a Docker-based backend
 	@echo "$(GREEN)==> Start Docker-based Plone Backend$(RESET)"
 	docker run -it --rm --name=backend -p 8080:8080 -e SITE=Plone -e ADDONS='$(KGS)' $(DOCKER_IMAGE)
 
+.PHONY: preinstall
+preinstall: ## Preinstall task, checks if missdev (mrs-developer) is present and runs it
+	if [ -f $$(pwd)/mrs.developer.json ]; then make develop; fi
+
+.PHONY: develop
+develop: ## Runs missdev in the local project (mrs.developer.json should be present)
+	npx -p mrs-developer missdev --config=jsconfig.json --output=addons --fetch-https
+
 .PHONY: help
 help:		## Show this help.
 	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 00000000..8fdfa0b8
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "paths": {
+            "volto-form-block": [
+                "addons/volto-form-block/src"
+            ]
+        },
+        "baseUrl": "src"
+    },
+    "exclude": [
+        "node_modules",
+        "omelette",
+        "build",
+        "**/node_modules",
+        "dist"
+    ]
+}
\ No newline at end of file
diff --git a/mrs.developer.json b/mrs.developer.json
new file mode 100644
index 00000000..2d41f4ad
--- /dev/null
+++ b/mrs.developer.json
@@ -0,0 +1,9 @@
+{
+  "volto-form-block": {
+    "url": "https://github.com/pretagov/volto-form-block.git",
+    "package": "volto-form-block",
+    "path": "src",
+    "branch": "deploy",
+    "develop": true
+  }
+}
diff --git a/package.json b/package.json
index a271d010..1dc7c8f1 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "material-icons": "1.13.6",
     "nsw-design-system": "3.5.1",
     "react-color": "2.19.3",
-    "volto-form-block": "3.0.1",
+    "volto-form-block": "file:./src/addons/volto-form-block",
     "volto-google-analytics": "2.0.0",
     "volto-siteinfo": "1.0.2",
     "volto-subblocks": "2.0.0",
diff --git a/src/addons/volto-form-block b/src/addons/volto-form-block
new file mode 160000
index 00000000..60200b5e
--- /dev/null
+++ b/src/addons/volto-form-block
@@ -0,0 +1 @@
+Subproject commit 60200b5ecd77cc5728f54c88a12e0e718c88c77c