diff --git a/.gitmodules b/.gitmodules
index 21cc33e..1f7e215 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "includes/kohana"]
 	path = includes/kohana
-	url = ssh://10.1.3.20/afs/local/git/lnkohana
-[submodule "modules/lnApp"]
-	path = modules/lnApp
-	url = ssh://10.1.3.20/afs/local/git/lnapp
+	url = git@dev.leenooks.net:deon/lnkohana.git
 [submodule "modules/ldap"]
 	path = modules/ldap
-	url = ssh://10.1.3.20/afs/local/git/khldap
+	url = git@dev.leenooks.net:deon/lnldap.git
+[submodule "modules/lnapp"]
+	path = modules/lnapp
+	url = git@dev.leenooks.net:deon/lnapp.git
diff --git a/application/bootstrap.php b/application/bootstrap.php
index 5199a8b..3e5f70a 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -113,7 +113,7 @@ Kohana::modules(array(
 	'auth'       => SMDPATH.'auth',       // Basic authentication
 	'cache'      => SMDPATH.'cache',      // Caching with multiple backends
 	// 'codebench'  => SMDPATH.'codebench',  // Benchmarking tool
-	// 'ldap'       => MODPATH.'ldap',       // LDAP Database Interaction (Depends on DATABASE which must be after this)
+	'ldap'       => MODPATH.'ldap',       // LDAP Database Interaction (Depends on DATABASE which must be after this)
 	'database'   => SMDPATH.'database',   // Database access
 	// 'image'      => SMDPATH.'image',      // Image manipulation
 	'minion'     => SMDPATH.'minion',     // CLI Tasks
diff --git a/includes/kohana b/includes/kohana
index f5c623d..c8517e6 160000
--- a/includes/kohana
+++ b/includes/kohana
@@ -1 +1 @@
-Subproject commit f5c623d89783fc9bf3c8dbea7699fcefa0015c3d
+Subproject commit c8517e61da035c510e9fdbefa4efd2e64dcb0dfe
diff --git a/modules/ldap b/modules/ldap
index a82edbf..867098a 160000
--- a/modules/ldap
+++ b/modules/ldap
@@ -1 +1 @@
-Subproject commit a82edbf64c8211588e6a21b0b581de245404c603
+Subproject commit 867098afdeb20de8d4c91b0ccb2ede09cdb7591b
diff --git a/modules/lnApp b/modules/lnApp
deleted file mode 160000
index 9eb699d..0000000
--- a/modules/lnApp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9eb699d50e19fb57e8305b47aded5b41204a8a1b
diff --git a/modules/lnapp b/modules/lnapp
new file mode 160000
index 0000000..a889d25
--- /dev/null
+++ b/modules/lnapp
@@ -0,0 +1 @@
+Subproject commit a889d25eda0d6c1b8766b15f2d71f3dd4f0357d9