diff --git a/build.versions b/build.versions
index 0aa9be3..15a67bb 100644
--- a/build.versions
+++ b/build.versions
@@ -15,7 +15,6 @@
 org.apache.catalina=6.0.29
 org.apache.commons.fileupload=1.2.0
 org.apache.commons.io=1.4.0
-org.apache.felix=1.2.4
 org.apache.felix.eventadmin=1.0.0
 org.apache.taglibs.standard=1.1.2
 org.apache.tiles.osgi=2.1.2.osgi
@@ -27,6 +26,8 @@
 org.springframework.js=2.0.8.RELEASE
 org.springframework.osgi=1.2.1
 org.springframework=3.0.0.RELEASE
+org.eclipse.osgi.services=3.1.200.v20071203
+org.eclipse.equinox.cm=1.0.200.v20100520
 
 # Test
 org.eclipse.virgo.teststubs=2.2.0.M01
diff --git a/org.eclipse.virgo.apps.admin.core/ivy.xml b/org.eclipse.virgo.apps.admin.core/ivy.xml
index b9dc6fd..9ccd0e1 100644
--- a/org.eclipse.virgo.apps.admin.core/ivy.xml
+++ b/org.eclipse.virgo.apps.admin.core/ivy.xml
@@ -30,7 +30,8 @@
 
 		<!-- === PROVIDED-RUNTIME =========================================== -->
 		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
-		<dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix}" conf="provided->runtime"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="provided->runtime"/>
+		<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="provided->runtime"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="${org.apache.commons.fileupload}" conf="provided->runtime"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="${org.apache.commons.io}" conf="provided->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="provided->runtime"/>
diff --git a/org.eclipse.virgo.apps.admin.web/ivy.xml b/org.eclipse.virgo.apps.admin.web/ivy.xml
index 38484ed..ba002f3 100644
--- a/org.eclipse.virgo.apps.admin.web/ivy.xml
+++ b/org.eclipse.virgo.apps.admin.web/ivy.xml
@@ -26,7 +26,8 @@
         <dependency org="org.eclipse.virgo.apps" name="org.eclipse.virgo.apps.admin.core" rev="latest.integration" conf="provided->compile"/>
 		<!-- === RUNTIME-DEFAULT =========================================== -->
 		<!-- === PROVIDED-RUNTIME =========================================== -->
-		<dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix}" conf="provided->runtime"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="provided->runtime"/>
+		<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="provided->runtime"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="${javax.servlet}" conf="provided->runtime"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="provided->runtime"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="${javax.servlet.jstl}" conf="provided->runtime"/>
diff --git a/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
index a81e535..deec430 100644
--- a/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
@@ -5,7 +5,8 @@
  file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
  file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.core-${org.eclipse.virgo.medic}.jar@start,\
  file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi-${org.eclipse.virgo.util}.jar@start,\
- file:../ivy-cache/repository/org.apache.felix/org.apache.felix.configadmin/${org.apache.felix}/org.apache.felix.configadmin-${org.apache.felix}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
+ file:../ivy-cache/repository/org.eclipse.equinox/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
  file:../ivy-cache/repository/org.apache.felix/org.apache.felix.eventadmin/${org.apache.felix.eventadmin}/org.apache.felix.eventadmin-${org.apache.felix.eventadmin}.jar@start,\
  file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/${org.eclipse.virgo.util}/org.eclipse.virgo.util.common-${org.eclipse.virgo.util}.jar@start,\
  file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/${org.eclipse.virgo.util}/org.eclipse.virgo.util.io-${org.eclipse.virgo.util}.jar@start,\