diff --git a/sandbox_product/sandbox.product b/sandbox_product/sandbox.product
index 9538a2af..f4289eb3 100644
--- a/sandbox_product/sandbox.product
+++ b/sandbox_product/sandbox.product
@@ -3,7 +3,6 @@
 
 <product name="Sandbox Product" uid="sandbox.bundle.producteclipse" id="sandbox.bundle.producteclipse" application="org.eclipse.ui.ide.workbench" version="1.2.0.qualifier" type="features" includeLaunchers="false" autoIncludeRequirements="true">
 
-
    <configIni use="default">
    </configIni>
 
@@ -35,7 +34,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
@@ -206,6 +204,11 @@ United States, other countries, or both.
       <feature id="org.eclipse.e4.rcp"/>
       <feature id="org.eclipse.egit"/>
       <feature id="org.eclipse.jgit"/>
+      <feature id="org.eclipse.jgit.gpg.bc" installMode="root"/>
+      <feature id="org.eclipse.jgit.http.apache" installMode="root"/>
+      <feature id="org.eclipse.jgit.lfs" installMode="root"/>
+      <feature id="org.eclipse.jgit.ssh.jsch" installMode="root"/>
+      <feature id="org.eclipse.pde.spies" installMode="root"/>
       <feature id="sandbox_encoding_quickfix_feature"/>
       <feature id="sandbox_extra_search_feature"/>
       <feature id="sandbox_usage_view_feature"/>
diff --git a/sandbox_target/eclipse.target b/sandbox_target/eclipse.target
index 2fc084b6..d5b6a07d 100644
--- a/sandbox_target/eclipse.target
+++ b/sandbox_target/eclipse.target
@@ -6,6 +6,10 @@
 			<repository location="https://download.eclipse.org/releases/2024-09/"/>
 			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jgit.lfs.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.jdt.astview.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.jdt.jeview.feature.feature.group" version="0.0.0"/>
@@ -28,6 +32,7 @@
 			<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.ecf.core.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.gef.common.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
@@ -35,8 +40,16 @@
 			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.platform.ide" version="0.0.0"/>
 			<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+			<unit id="org.eclipse.dltk.core.index.lucene.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.equinox.server.jetty.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/technology/babel/update-site/latest/"/>
@@ -87,15 +100,17 @@
 			<unit id="org.eclipse.orbit.maven.org.apache.batik.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.orbit.maven.net.java.dev.jna.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.orbit.maven.org.antlr.3.x.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.orbit.maven.com.jcraft.jsch.feature.group" version="4.33.0"/>
+			<unit id="org.eclipse.orbit.maven.com.jcraft.jzlib.feature.group" version="4.33.0"/>
 		</location>
-		<!--
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
+		<!--
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
 		</location>-->
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/justj/jres/21/updates/release/latest/"/>