diff --git a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.editor/META-INF/MANIFEST.MF b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.editor/META-INF/MANIFEST.MF
index 54a7aef4398..de0b7497afd 100644
--- a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.editor/META-INF/MANIFEST.MF
+++ b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.editor/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="1.2.0",
  org.eclipse.ui.workbench;bundle-version="3.106.0",
  org.eclipse.ui.views;bundle-version="3.7.0",
  org.eclipse.ui,
- org.apache.batik.util;bundle-version="[1.10.0,1.11.0)"
+ org.apache.xmlgraphics.batik-util;bundle-version="[1.10.0,1.11.0)"
 Bundle-Vendor: Xihui Chen<chenx1@ornl.gov> - SNS
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.csstudio.opibuilder.editor.Activator
diff --git a/core/ui/ui-plugins/org.csstudio.perspectives/META-INF/MANIFEST.MF b/core/ui/ui-plugins/org.csstudio.perspectives/META-INF/MANIFEST.MF
index b75280214d7..1380423f3da 100644
--- a/core/ui/ui-plugins/org.csstudio.perspectives/META-INF/MANIFEST.MF
+++ b/core/ui/ui-plugins/org.csstudio.perspectives/META-INF/MANIFEST.MF
@@ -21,5 +21,6 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="3.5.0",
  javax.annotation;bundle-version="1.2.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
+Import-Package: javax.inject
 Export-Package: org.csstudio.perspectives
 Bundle-Activator: org.csstudio.perspectives.Plugin
diff --git a/core/utility/utility-plugins/org.csstudio.utility.batik/META-INF/MANIFEST.MF b/core/utility/utility-plugins/org.csstudio.utility.batik/META-INF/MANIFEST.MF
index 2ae40075edb..0e481ea00f2 100644
--- a/core/utility/utility-plugins/org.csstudio.utility.batik/META-INF/MANIFEST.MF
+++ b/core/utility/utility-plugins/org.csstudio.utility.batik/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.w3c.dom.svg,
  org.apache.xmlgraphics.batik-dom;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-svg-dom;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-transcoder;bundle-version="[1.10.0,1.11.0)",
- org.apache.batik.css;bundle-version="[1.10.0,1.11.0)",
+ org.apache.xmlgraphics.batik-css;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-xml;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-awt-util;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-anim;bundle-version="[1.10.0,1.11.0)",
@@ -22,7 +22,8 @@ Require-Bundle: org.w3c.dom.svg,
  org.apache.xmlgraphics.batik-script;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-ext;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-parser;bundle-version="[1.10.0,1.11.0)",
- org.apache.batik.util;bundle-version="[1.10.0,1.11.0)",
+ org.apache.xmlgraphics.batik-constants;bundle-version="[1.10.0,1.11.0)",
+ org.apache.xmlgraphics.batik-util;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-codec;bundle-version="[1.10.0,1.11.0)"
 Export-Package: org.csstudio.utility.batik
 Bundle-ActivationPolicy: lazy
diff --git a/maven-osgi-bundles/repository/pom.xml b/maven-osgi-bundles/repository/pom.xml
index d18cfb23068..045b76c916e 100644
--- a/maven-osgi-bundles/repository/pom.xml
+++ b/maven-osgi-bundles/repository/pom.xml
@@ -185,6 +185,9 @@
                     <Require-Bundle>com.squareup.retrofit2.converter-moshi,com.squareup.okhttp3.logging-interceptor</Require-Bundle>
                   </instructions>
                 </artifact>
+                <artifact>
+                  <id>org.apache.xmlgraphics:batik-util:1.10</id>
+                </artifact>
                 <artifact>
                   <id>org.apache.xmlgraphics:batik-bridge:1.10</id>
                   <instructions>
@@ -209,13 +212,19 @@
                       <Require-Bundle>org.apache.batik.util;bundle-version="1.10.0",org.apache.xmlgraphics.batik-codec;bundle-version="1.10.0"</Require-Bundle>
                   </instructions>
                 </artifact>
-		<artifact>
+                <artifact>
+                  <id>org.apache.xmlgraphics:batik-css:1.10</id>
+                  <instructions>
+                      <Require-Bundle>org.apache.batik.util;bundle-version="1.10.0"</Require-Bundle>
+                  </instructions>
+                </artifact>
+                <artifact>
                   <id>org.apache.xmlgraphics:batik-codec:1.10</id>
                   <instructions>
                       <Require-Bundle>org.apache.batik.util;bundle-version="1.10.0"</Require-Bundle>
                   </instructions>
                 </artifact>
-		<artifact>
+                <artifact>
                   <id>org.apache.xmlgraphics:batik-xml:1.10</id>
                   <instructions>
                       <Require-Bundle>org.apache.batik.util;bundle-version="1.10.0",org.apache.batik.constants;bundle-version="1.10.0"</Require-Bundle>
diff --git a/pom.xml b/pom.xml
index cb87ee7ad13..51242cef6ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
     <eclipse.central.url>http://download.eclipse.org</eclipse.central.url>
     <eclipse.mirror.url>${eclipse.central.url}</eclipse.mirror.url>
     <eclipse.runtime.version>3.10.0-v20140318-2214</eclipse.runtime.version>
-    <eclipse-site>${eclipse.mirror.url}/releases/2018-12</eclipse-site>
-    <eclipse-update-site>${eclipse.mirror.url}/eclipse/updates/4.10</eclipse-update-site>
+    <eclipse-site>${eclipse.mirror.url}/releases/2020-06</eclipse-site>
+    <eclipse-update-site>${eclipse.mirror.url}/eclipse/updates/4.16</eclipse-update-site>
     <efx-site>${eclipse.mirror.url}/efxclipse/runtime-released/3.5.0/site</efx-site>
     <openjfx-site>http://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-11/repository</openjfx-site>
 
@@ -50,7 +50,7 @@
     <upload.root>s3://download.controlsystemstudio.org</upload.root>
     <download.root>http://download.controlsystemstudio.org</download.root>
 
-    <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository</orbit-site>
+    <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137.repository</orbit-site>
 
     <!-- SonarQube configuration -->
     <sonar.language>java</sonar.language>