diff --git a/ipojo/junit4osgi/junit4osgi/metadata.xml b/ipojo/junit4osgi/junit4osgi/metadata.xml
index 6497c6e..045e20c 100644
--- a/ipojo/junit4osgi/junit4osgi/metadata.xml
+++ b/ipojo/junit4osgi/junit4osgi/metadata.xml
@@ -17,8 +17,8 @@
   under the License.
 -->
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd 
-      org.apache.felix.ipojo.extender http://people.apache.org/~clement/ipojo/schemas/extender-pattern.xsd"
+  xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd
+      org.apache.felix.ipojo.extender http://felix.apache.org/ipojo/schemas/CURRENT/extender-pattern.xsd"
   xmlns="org.apache.felix.ipojo"
   xmlns:extender="org.apache.felix.ipojo.extender">
   <component
diff --git a/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd b/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd
index 1fdf992..f127ddd 100644
--- a/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd
+++ b/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd
@@ -21,7 +21,7 @@
 	xmlns="org.apache.felix.ipojo.composite"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ipojo="org.apache.felix.ipojo">
 
-	<xs:import namespace="org.apache.felix.ipojo" schemaLocation="http://people.apache.org/~clement/ipojo/schemas/core.xsd"></xs:import>
+	<xs:import namespace="org.apache.felix.ipojo" schemaLocation="http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"></xs:import>
 	<xs:complexType name="CompositeType">
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element ref="subservice" minOccurs="0"
diff --git a/ipojo/runtime/composite/src/main/resources/composite.xsd b/ipojo/runtime/composite/src/main/resources/composite.xsd
index 6a95fb8..2d01df1 100644
--- a/ipojo/runtime/composite/src/main/resources/composite.xsd
+++ b/ipojo/runtime/composite/src/main/resources/composite.xsd
@@ -21,7 +21,7 @@
 	xmlns="org.apache.felix.ipojo.composite"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ipojo="org.apache.felix.ipojo">
 
-	<xs:import namespace="org.apache.felix.ipojo" schemaLocation="http://people.apache.org/~clement/ipojo/schemas/core.xsd"></xs:import>
+	<xs:import namespace="org.apache.felix.ipojo" schemaLocation="http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"></xs:import>
 	<xs:complexType name="CompositeType">
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element ref="subservice" minOccurs="0"
diff --git a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
index 3f7383f..2c41b1f 100644
--- a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
+++ b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 
 	<instance component="org.apache.felix.ipojo.core.tests.components.MyComponent"
diff --git a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
index 38fd8a3..8c8ddb0 100644
--- a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
+++ b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.core.tests.components.MyComponent" version="1.1">
 		<provides/>
diff --git a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
index d6e77a1..51c85fe 100644
--- a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
+++ b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.core.tests.components.MyComponent" version="1.0">
 		<provides/>
diff --git a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
index a35d99d..5b48b57 100644
--- a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
+++ b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.core.tests.components.MyComponent" version="1.0">
 		<provides/>
diff --git a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
index aa7d9f3..40c9e88 100644
--- a/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
+++ b/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.core.tests.components.MyComponent" version="2.0">
 		<provides/>
diff --git a/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml b/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml
index 7955c4a..05e233c 100644
--- a/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml
+++ b/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 		<component
 		classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
diff --git a/ipojo/tests/core/configuration/src/main/ipojo/updated.xml b/ipojo/tests/core/configuration/src/main/ipojo/updated.xml
index 09374e8..45fd9b7 100644
--- a/ipojo/tests/core/configuration/src/main/ipojo/updated.xml
+++ b/ipojo/tests/core/configuration/src/main/ipojo/updated.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<!--  updated -->
 	 <component
diff --git a/ipojo/tests/core/factory-version/instances.xml b/ipojo/tests/core/factory-version/instances.xml
index 40c8411..500d161 100644
--- a/ipojo/tests/core/factory-version/instances.xml
+++ b/ipojo/tests/core/factory-version/instances.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 
 	<instance component="org.apache.felix.ipojo.tests.core.component.MyComponent"
diff --git a/ipojo/tests/core/factory-version/provider-v1.1.xml b/ipojo/tests/core/factory-version/provider-v1.1.xml
index a75f841..6d387b6 100644
--- a/ipojo/tests/core/factory-version/provider-v1.1.xml
+++ b/ipojo/tests/core/factory-version/provider-v1.1.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.tests.core.component.MyComponent" version="BuNdlE">
 		<provides/>
diff --git a/ipojo/tests/core/factory-version/provider-v1.xml b/ipojo/tests/core/factory-version/provider-v1.xml
index 2625d41..a89195d 100644
--- a/ipojo/tests/core/factory-version/provider-v1.xml
+++ b/ipojo/tests/core/factory-version/provider-v1.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.tests.core.component.MyComponent" version="1.0">
 		<provides/>
diff --git a/ipojo/tests/core/factory-version/vprovider-v1.xml b/ipojo/tests/core/factory-version/vprovider-v1.xml
index 4e40ae9..9aee6b7 100644
--- a/ipojo/tests/core/factory-version/vprovider-v1.xml
+++ b/ipojo/tests/core/factory-version/vprovider-v1.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.tests.core.component.MyComponent" version="1.0">
 		<provides/>
diff --git a/ipojo/tests/core/factory-version/vprovider-v2.xml b/ipojo/tests/core/factory-version/vprovider-v2.xml
index 31d2434..676764d 100644
--- a/ipojo/tests/core/factory-version/vprovider-v2.xml
+++ b/ipojo/tests/core/factory-version/vprovider-v2.xml
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.tests.core.component.MyComponent" version="2.0">
 		<provides/>