diff --git a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
index 041921fb..2d032157 100644
--- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
@@ -11,9 +11,9 @@
   <packageMetaData
    packageName="Eclipse IDE for Eclipse Committers"
    maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/committers.png"
+   iconurl="https://www.eclipse.org/downloads/images/committers.png"
    bugzillaComponentId="committers-package"
-   testPlan="" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[
 Package suited for development of Eclipse itself at Eclipse.org; based on the Eclipse Platform adding PDE, Git, Marketplace Client, source code and developer documentation.<br/>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
index 90660d7c..0d56ab70 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for C/C++ Developers"
    maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/cdt.png"
+   iconurl="https://www.eclipse.org/downloads/images/cdt.png"
    bugzillaComponentId="cpp-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[An IDE for C/C++ developers.]]></description>
     <!-- packageTesters is a list of the people that are testing the package -->
diff --git a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
index ecbf6734..ddef21dd 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for Java and DSL Developers"
    maintainer="Xtext Project"
-   iconurl="http://www.eclipse.org/downloads/images/dsl-package_42.png"
+   iconurl="https://www.eclipse.org/downloads/images/dsl-package_42.png"
    bugzillaComponentId="dsl-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[The essential tools for Java and DSL developers, including a Java & Xtend IDE, a DSL Framework (Xtext), a Git client, XML Editor, and Maven integration.]]></description>
     <!-- packageTesters is a list of the people that are testing the package -->
diff --git a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
index 5f4484ef..ce39747a 100644
--- a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
@@ -10,10 +10,10 @@
   <packageMetaData
    packageName="Eclipse IDE for Embedded C/C++ Developers"
    maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/cdt.png"
+   iconurl="https://www.eclipse.org/downloads/images/cdt.png"
    bugzillaComponentId="embedcpp-package"
    githubName="eclipse-embed-cdt/eclipse-plugins"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[
 An <a href="https://eclipse-embed-cdt.github.io">IDE for Embedded C/C++ developers</a>. It includes  managed cross build plug-ins (<b>Arm</b> and <b>RISC-V</b>) and debug plug-ins (SEGGER <b>J-Link</b>, <b>OpenOCD</b>, <b>pyocd</b>, and <b>QEMU</b>), plus a number of templates to create ready to run blinky projects.
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
index 9011d9cd..20964772 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for Java Developers"
    maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/java.png"
+   iconurl="https://www.eclipse.org/downloads/images/java.png"
    bugzillaComponentId="java-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[The essential tools for any Java developer, including a Java IDE, a Git client, XML Editor, Maven and Gradle integration]]></description>
     <!-- packageTesters is a list of the people that are testing the package -->
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
index 5b8a5f7e..79e5c019 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for Enterprise Java and Web Developers"
    maintainer="Eclipse Packaging and Web Tools Platform Projects"
-   iconurl="http://www.eclipse.org/downloads/images/javaee.png"
+   iconurl="https://www.eclipse.org/downloads/images/javaee.png"
    bugzillaComponentId="jee-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[Tools for developers working with Java and Web applications, including a Java IDE, tools for JavaScript, TypeScript, JavaServer Pages and Faces, Yaml, Markdown, Web Services, JPA and Data Tools, Maven and Gradle, Git, and more.<br/>
 <br/>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
index 2c9e7c2a..111dffd3 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse Modeling Tools"
    maintainer="Remi Schnekenburger"
-   iconurl="http://www.eclipse.org/modeling/images/modeling_about.png"
+   iconurl="https://www.eclipse.org/modeling/images/modeling_about.png"
    bugzillaComponentId="modeling-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
     <description><![CDATA[The Modeling package provides tools and runtimes for building model-based applications.
         You can use it to graphically design domain models, to leverage those models at design time by creating and editing dynamic instances, to collaborate via Eclipse's team support with facilities for comparing and merging models and model instances structurally, and finally to generate Java code from those models to produce complete applications.
diff --git a/packages/org.eclipse.epp.package.php.feature/epp.website.xml b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
index 20b23cc8..7cb1159b 100644
--- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for PHP Developers"
    maintainer="Eclipse Packaging Project and PHP Development Tools Project"
-   iconurl="http://www.eclipse.org/downloads/images/php.png"
+   iconurl="https://www.eclipse.org/downloads/images/php.png"
    bugzillaComponentId="php-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
     <description><![CDATA[The essential tools for any PHP developer, including PHP language support, Git client and editors for JavaScript, TypeScript, HTML, CSS and XML.<br />
 Click <a href="https://github.com/eclipse/pdt/issues/new/choose">here</a> to raise an issue with Eclipse PHP Development Tools.<br />
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
index 7a08e8d9..616ea51e 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for RCP and RAP Developers"
    maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/rcp.png"
+   iconurl="https://www.eclipse.org/downloads/images/rcp.png"
    bugzillaComponentId="rcp-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
      <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[A complete set of tools for developers who want to create Eclipse plug-ins, Rich Client Applications or Remote Application Platform (RCP+RAP), plus Maven and Gradle tooling, and an XML editor. It contains the EGit tooling for accessing Git version control systems, and Eclipse Passage which helps with license management for Eclipse-based products.]]></description>
      <!-- packageTesters is a list of the people that are testing the package -->
diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
index 3cdc859f..e4a9d0ae 100644
--- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
@@ -10,9 +10,9 @@
   <packageMetaData
    packageName="Eclipse IDE for Scout Developers"
    maintainer="Eclipse Scout Project"
-   iconurl="http://www.eclipse.org/downloads/images/scout.jpg"
+   iconurl="https://www.eclipse.org/downloads/images/scout.jpg"
    bugzillaComponentId="scout-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
+   testPlan="">
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
      <description><![CDATA[<a href="https://www.eclipse.org/scout">Eclipse Scout</a> is a Java/HTML5 framework to develop business applications that run on the desktop, on tablets and mobile devices. This package includes Eclipse IDE support for Scout developers and source code.]]></description>
     <!-- packageTesters is a list of the people that are testing the package -->