diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml
index aceee6aba..77000088b 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml
@@ -155,7 +155,7 @@
 	<bundle id="com.google.gson"/>
 	<bundle id="org.jcodings"/>
 	<bundle id="org.joni"/>
-	<bundle id="org.json"/>
+	<bundle id="json"/>
 	<bundle id="org.jsoup"/>
 	<bundle id="org.apache.commons.lang3"/>
 	<bundle id="org.apache.commons.collections"/>
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF
index de3ecdc46..75a6671b1 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Export-Package: org.springframework.ide.eclipse.beans.ui.live,
  org.springframework.ide.eclipse.beans.ui.live.utils
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.views,
- org.json,
  org.eclipse.core.resources,
  org.eclipse.jface,
  org.eclipse.ui.workbench,
@@ -21,7 +20,8 @@ Require-Bundle: org.eclipse.core.runtime,
  com.google.guava,
  org.springsource.ide.eclipse.commons.livexp,
  org.springsource.ide.eclipse.commons.frameworks.core
-Import-Package: org.apache.commons.lang3
+Import-Package: org.apache.commons.lang3,
+ org.json
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Spring IDE Developers
 Bundle-Activator: org.springframework.ide.eclipse.beans.ui.live.LiveBeansUiPlugin
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
index d17426032..55f32a5ea 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.debug.ui,
  org.eclipse.ui.forms,
- org.json,
  com.google.guava;bundle-version="15.0.0",
  org.eclipse.equinox.security,
  org.eclipse.ui.views.properties.tabbed,
@@ -84,5 +83,6 @@ Import-Package: org.eclipse.core.runtime,
  com.google.gson.reflect,
  com.google.gson.stream,
  org.apache.commons.lang3,
- org.apache.commons.lang3.tuple
+ org.apache.commons.lang3.tuple,
+ org.json
 Automatic-Module-Name: org.springframework.ide.eclipse.boot.dash
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
index 35402982d..3c8851fe7 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 4.24.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui,
  org.springsource.ide.eclipse.commons.livexp;bundle-version="3.8.4",
- org.json;bundle-version="1.0.0",
  org.eclipse.core.resources,
  com.google.guava,
  org.eclipse.jdt.ui,
@@ -49,5 +48,6 @@ Import-Package: org.eclipse.core.runtime,
  org.apache.commons.lang3,
  org.eclipse.osgi.util,
  org.osgi.framework,
- javax.inject
+ javax.inject,
+ org.json
 Automatic-Module-Name: org.springframework.ide.eclipse.boot.wizard
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
index 521782a69..113e1408f 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
@@ -30,7 +30,6 @@ Require-Bundle: org.eclipse.core.resources,
  com.fasterxml.jackson.core.jackson-annotations,
  org.eclipse.ui.forms,
  org.eclipse.ltk.core.refactoring,
- org.json,
  org.eclipse.m2e.launching,
  io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)",
  org.reactivestreams.reactive-streams,
@@ -48,6 +47,7 @@ Export-Package: org.springframework.ide.eclipse.boot.core,
  org.springframework.ide.eclipse.boot.util,
  org.springframework.ide.eclipse.boot.util.version
 Import-Package: org.apache.commons.lang3,
+ org.json,
  org.apache.commons.io,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,