diff --git a/spec/src/main/asciidoc/ch04-client_apis.adoc b/spec/src/main/asciidoc/ch04-client_apis.adoc
index c2095d6..0982db8 100644
--- a/spec/src/main/asciidoc/ch04-client_apis.adoc
+++ b/spec/src/main/asciidoc/ch04-client_apis.adoc
@@ -249,7 +249,7 @@ illustrates the class relationships.
[[bprovclsrel]]
.Binding Provider Class Relationships
-image::images/bindingprovider.png[]
+image::images/bindingprovider.svg[]
A web service client can get an `jakarta.xml.ws.EndpointReference` from a
`BindingProvider` instance that will reference the target endpoint.
diff --git a/spec/src/main/asciidoc/ch10-handler_framwork.adoc b/spec/src/main/asciidoc/ch10-handler_framwork.adoc
index d83f005..78cc36d 100644
--- a/spec/src/main/asciidoc/ch10-handler_framwork.adoc
+++ b/spec/src/main/asciidoc/ch10-handler_framwork.adoc
@@ -40,7 +40,7 @@ invoked with different types of message context.
[[handarchfig]]
.Handler architecture
-image::images/handarch.png[]
+image::images/handarch.svg[]
[[handlertypes]]
==== Types of Handler
@@ -67,7 +67,7 @@ protocol-specific interface that extends `jakarta.xml.ws.handler.Handler`.
[[handclshie]]
.Handler class hierarchy
-image::images/handlers.png[]
+image::images/handlers.svg[]
[[binding-responsibilities]]
==== Binding Responsibilities
@@ -181,7 +181,7 @@ the order of handler execution for inbound and outbound messages.
[[handord]]
.Handler ordering, Ln and Pn represent logical and protocol handlers respectively.
-image::images/handord.png[]
+image::images/handord.svg[]
[[handlerchain]]
===== jakarta.jws.HandlerChain annotation
diff --git a/spec/src/main/asciidoc/images/bindingprovider.png b/spec/src/main/asciidoc/images/bindingprovider.png
deleted file mode 100644
index f9190a0..0000000
Binary files a/spec/src/main/asciidoc/images/bindingprovider.png and /dev/null differ
diff --git a/spec/src/main/asciidoc/images/bindingprovider.svg b/spec/src/main/asciidoc/images/bindingprovider.svg
new file mode 100644
index 0000000..6915410
--- /dev/null
+++ b/spec/src/main/asciidoc/images/bindingprovider.svg
@@ -0,0 +1,269 @@
+
+
+
+
diff --git a/spec/src/main/asciidoc/images/handarch.png b/spec/src/main/asciidoc/images/handarch.png
deleted file mode 100644
index 8d6189c..0000000
Binary files a/spec/src/main/asciidoc/images/handarch.png and /dev/null differ
diff --git a/spec/src/main/asciidoc/images/handarch.svg b/spec/src/main/asciidoc/images/handarch.svg
new file mode 100644
index 0000000..935df96
--- /dev/null
+++ b/spec/src/main/asciidoc/images/handarch.svg
@@ -0,0 +1,268 @@
+
+
+
+
diff --git a/spec/src/main/asciidoc/images/handlers.png b/spec/src/main/asciidoc/images/handlers.png
deleted file mode 100644
index 6d30c29..0000000
Binary files a/spec/src/main/asciidoc/images/handlers.png and /dev/null differ
diff --git a/spec/src/main/asciidoc/images/handlers.svg b/spec/src/main/asciidoc/images/handlers.svg
new file mode 100644
index 0000000..7746032
--- /dev/null
+++ b/spec/src/main/asciidoc/images/handlers.svg
@@ -0,0 +1,144 @@
+
+
+
+
diff --git a/spec/src/main/asciidoc/images/handord.png b/spec/src/main/asciidoc/images/handord.png
deleted file mode 100644
index 5a7680a..0000000
Binary files a/spec/src/main/asciidoc/images/handord.png and /dev/null differ
diff --git a/spec/src/main/asciidoc/images/handord.svg b/spec/src/main/asciidoc/images/handord.svg
new file mode 100644
index 0000000..1cb5c91
--- /dev/null
+++ b/spec/src/main/asciidoc/images/handord.svg
@@ -0,0 +1,315 @@
+
+
+
+