diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index de0c0f03..0a4c72ca 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -279,4 +281,9 @@ United States, other countries, or both.
       <plugin id="slf4j.simple"/>
    </plugins>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
+
 </product>
diff --git a/packages/org.eclipse.epp.package.committers.product/p2.inf b/packages/org.eclipse.epp.package.committers.product/p2.inf
index e5d92d5c..7057499e 100644
--- a/packages/org.eclipse.epp.package.committers.product/p2.inf
+++ b/packages/org.eclipse.epp.package.committers.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.committers.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.committers.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.committers.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.committers.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.committers.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.committers.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse Committers package.
 
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 884ced06..b64e010a 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -283,4 +285,9 @@ United States, other countries, or both.
       <plugin id="slf4j.simple"/>
    </plugins>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
+
 </product>
diff --git a/packages/org.eclipse.epp.package.cpp.product/p2.inf b/packages/org.eclipse.epp.package.cpp.product/p2.inf
index cb1a3fbb..d3269a3f 100644
--- a/packages/org.eclipse.epp.package.cpp.product/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.cpp.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.cpp.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.cpp.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.cpp.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.cpp.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.cpp.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse C/C++ Developers Developers package.
 
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index ee1bcbf1..755cb9cf 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -71,6 +71,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -253,5 +255,9 @@ United States, other countries, or both.
       <feature id="org.eclipse.buildship" installMode="root"/>
    </features>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.dsl.product/p2.inf b/packages/org.eclipse.epp.package.dsl.product/p2.inf
index 1fa20c3d..8099b1e8 100644
--- a/packages/org.eclipse.epp.package.dsl.product/p2.inf
+++ b/packages/org.eclipse.epp.package.dsl.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.dsl.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.dsl.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.dsl.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.dsl.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.dsl.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.dsl.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse DSL Tools package.
 
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index a52ce037..036a4854 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -299,4 +301,9 @@ United States, other countries, or both.
       <plugin id="slf4j.simple"/>
    </plugins>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
+
 </product>
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/p2.inf b/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
index f1f42d7f..05718b4d 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
+++ b/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.embedcpp.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.embedcpp.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.embedcpp.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.embedcpp.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.embedcpp.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.embedcpp.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse Embedded C/C++ Developers Developers package.
 
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index 6977f407..18004182 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -71,6 +71,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -261,5 +263,9 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
    </features>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.java.product/p2.inf b/packages/org.eclipse.epp.package.java.product/p2.inf
index 471aa43e..619d5fa1 100644
--- a/packages/org.eclipse.epp.package.java.product/p2.inf
+++ b/packages/org.eclipse.epp.package.java.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.java.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.java.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.java.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.java.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.java.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.java.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse Java Developers package.
 
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 9bc90e13..18ec75b1 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -71,6 +71,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -328,5 +330,9 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
    </features>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.jee.product/p2.inf b/packages/org.eclipse.epp.package.jee.product/p2.inf
index 1eec3d2f..7461187c 100644
--- a/packages/org.eclipse.epp.package.jee.product/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.jee.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.jee.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.jee.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.jee.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.jee.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.jee.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse Enterprise Java and Web Developers package.
 
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 1dc7dd15..ba6eeded 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -283,5 +285,9 @@ United States, other countries, or both.
       <plugin id="slf4j.simple"/>
    </plugins>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.modeling.product/p2.inf b/packages/org.eclipse.epp.package.modeling.product/p2.inf
index 601165a3..2e0619c1 100644
--- a/packages/org.eclipse.epp.package.modeling.product/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.modeling.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.modeling.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.modeling.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.modeling.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.modeling.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.modeling.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse Modeling Tools package.
 
diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
index 761467f9..c15f96b4 100644
--- a/packages/org.eclipse.epp.package.parallel.product/epp.product
+++ b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -279,7 +281,10 @@ United States, other countries, or both.
       <targetfile overwrite="false"/>
    </preferencesInfo>
 
-   <cssInfo>
-   </cssInfo>
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
 
 </product>
+
diff --git a/packages/org.eclipse.epp.package.parallel.product/p2.inf b/packages/org.eclipse.epp.package.parallel.product/p2.inf
index 00b1f4f0..fe813037 100644
--- a/packages/org.eclipse.epp.package.parallel.product/p2.inf
+++ b/packages/org.eclipse.epp.package.parallel.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.parallel.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.parallel.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.parallel.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.parallel.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.parallel.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.parallel.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse IDE for Scientific Computing package.
 
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 68bbecd2..954c1cd8 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -266,4 +268,9 @@ United States, other countries, or both.
       <plugin id="slf4j.simple"/>
    </plugins>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
+
 </product>
diff --git a/packages/org.eclipse.epp.package.php.product/p2.inf b/packages/org.eclipse.epp.package.php.product/p2.inf
index b513242d..11d0366c 100644
--- a/packages/org.eclipse.epp.package.php.product/p2.inf
+++ b/packages/org.eclipse.epp.package.php.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.php.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.php.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.php.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.php.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.php.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.php.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse PHP Developers package.
 
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 87a83da0..e158523f 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -71,6 +71,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -274,5 +276,9 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
    </features>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.rcp.product/p2.inf b/packages/org.eclipse.epp.package.rcp.product/p2.inf
index d3efa9b6..ab4c665a 100644
--- a/packages/org.eclipse.epp.package.rcp.product/p2.inf
+++ b/packages/org.eclipse.epp.package.rcp.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.rcp.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.rcp.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.rcp.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.rcp.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.rcp.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.rcp.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse RCP/RAP Developers package.
 
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index 113ebeda..1d191dc7 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -73,6 +73,8 @@
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
    </configurations>
 
    <license>
@@ -267,4 +269,9 @@ United States, other countries, or both.
       <plugin id="slf4j.simple"/>
    </plugins>
 
+   <repositories>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
+   </repositories>
+
 </product>
diff --git a/packages/org.eclipse.epp.package.scout.product/p2.inf b/packages/org.eclipse.epp.package.scout.product/p2.inf
index 9adab759..da7f042f 100644
--- a/packages/org.eclipse.epp.package.scout.product/p2.inf
+++ b/packages/org.eclipse.epp.package.scout.product/p2.inf
@@ -1,46 +1,6 @@
 instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
   mkdir(path:${installFolder}/dropins);
 
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=toolingorg.eclipse.epp.scout.configuration.macosx
-requires.1.filter=(osgi.os=macosx)
-requires.1.range=[1.0.0,1.0.0]
-requires.1.greedy=true
-
-requires.2.namespace=org.eclipse.equinox.p2.iu
-requires.2.name=toolingorg.eclipse.epp.scout.configuration
-requires.2.filter=(!(osgi.os=macosx))
-requires.2.range=[1.0.0,1.0.0]
-requires.2.greedy=true
-
-units.1.id=toolingorg.eclipse.epp.scout.configuration.macosx
-units.1.version=1.0.0
-units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.1.provides.1.name=toolingorg.eclipse.epp.scout.configuration.macosx
-units.1.provides.1.version=1.0.0
-units.1.filter=(osgi.os=macosx)
-units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
-#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
-units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
-
-units.2.id=toolingorg.eclipse.epp.scout.configuration
-units.2.version=1.0.0
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=toolingorg.eclipse.epp.scout.configuration
-units.2.provides.1.version=1.0.0
-units.2.filter=(!(osgi.os=macosx))
-units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
-units.2.touchpoint.version=1.0.0
-units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
-
 # Bug 490515 - Prevent upgrade from old to new EPP package layout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
 #
@@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-# Set the product property type
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
-
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2023-12 Release of the Eclipse Scout Developers package.