diff --git a/.gitmodules b/.gitmodules
index 880cce08eec26432849768864422c1a9c2266c28..f5c1b168def62d7e50b5cae600d3da68f58a5c15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@ url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git
 [submodule "soctools_flow"]
 	path = soctools_flow
 	url = https://git.soton.ac.uk/soclabs/soctools_flow.git
-[submodule "chipkit_flow"]
-	path = chipkit_flow
-url = https://git.soton.ac.uk/soclabs/chipkit_flow.git
 [submodule "generic_lib_tech"]
 	path = generic_lib_tech
 	url = https://git.soton.ac.uk/soclabs/generic_lib_tech.git
diff --git a/chipkit_flow b/chipkit_flow
deleted file mode 160000
index 672416929813708f48e5376c8de00a4f7a69aa9a..0000000000000000000000000000000000000000
--- a/chipkit_flow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 672416929813708f48e5376c8de00a4f7a69aa9a
diff --git a/env/dependency_env.sh b/env/dependency_env.sh
index e21a54aec17b484923a4b5c14e66508504dcb648..bcde8187d3b8da6de60262bd8998b4f77f293cb5 100755
--- a/env/dependency_env.sh
+++ b/env/dependency_env.sh
@@ -36,8 +36,8 @@ export GENERIC_LIB_TECH_DIR="$PROJECT_DIR/generic_lib_tech"
 # Flows
 #-----------------------------------------------------------------------------
 
-# CHIPKIT - Register Generation
-export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit_flow"
-
 # SoCTools - Toolkit of scripts related to SoCLabs projects
-export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/soctools_flow"
\ No newline at end of file
+export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/soctools_flow"
+
+# CHIPKIT - Register Generation
+export CHIPKIT_FLOW_DIR="$SOCTOOLS_FLOW_DIR/tools/chipkit_flow"
diff --git a/soctools_flow b/soctools_flow
index 0ddd48965bfa1dd643a62021cdaef975da0f2154..7118711fe3f7fc93ad65bcd46203de73358b0545 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit 0ddd48965bfa1dd643a62021cdaef975da0f2154
+Subproject commit 7118711fe3f7fc93ad65bcd46203de73358b0545