diff --git a/.github/workflows/integration_test_linux.yml b/.github/workflows/integration_test_linux.yml
index 656b628..b5b270b 100644
--- a/.github/workflows/integration_test_linux.yml
+++ b/.github/workflows/integration_test_linux.yml
@@ -31,7 +31,7 @@ jobs:
       SPARK_REMOTE: "sc://localhost:15003"
     services:
       spark:
-        image: apache/spark:4.0.0-preview2
+        image: apache/spark:4.0.0
         env:
           SPARK_NO_DAEMONIZE: 1
         ports:
diff --git a/Examples/app/README.md b/Examples/app/README.md
index bede7c2..fd98481 100644
--- a/Examples/app/README.md
+++ b/Examples/app/README.md
@@ -7,7 +7,7 @@ This is an example Swift application to show how to use Apache Spark Connect Swi
 Prepare `Spark Connect Server` via running Docker image.
 
 ```
-docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
+docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
 ```
 
 Build an application Docker image.
@@ -23,7 +23,7 @@ Run `app` docker image.
 
 ```
 $ docker run --rm -e SPARK_REMOTE=sc://host.docker.internal:15002 apache/spark-connect-swift:app
-Connected to Apache Spark 4.0.0-preview2 Server
+Connected to Apache Spark 4.0.0 Server
 EXECUTE: DROP TABLE IF EXISTS t
 EXECUTE: CREATE TABLE IF NOT EXISTS t(a INT) USING ORC
 EXECUTE: INSERT INTO t VALUES (1), (2), (3)
@@ -52,7 +52,7 @@ Run from source code.
 ```
 $ swift run
 ...
-Connected to Apache Spark 4.0.0-preview2 Server
+Connected to Apache Spark 4.0.0 Server
 EXECUTE: DROP TABLE IF EXISTS t
 EXECUTE: CREATE TABLE IF NOT EXISTS t(a INT) USING ORC
 EXECUTE: INSERT INTO t VALUES (1), (2), (3)
diff --git a/Examples/pi/README.md b/Examples/pi/README.md
index 715c381..88d3bf9 100644
--- a/Examples/pi/README.md
+++ b/Examples/pi/README.md
@@ -6,7 +6,7 @@ This is an example Swift application to show how to use Apache Spark Connect Swi
 
 Prepare `Spark Connect Server` via running Docker image.
 ```
-docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
+docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
 ```
 
 Build an application Docker image.
diff --git a/Examples/spark-sql/README.md b/Examples/spark-sql/README.md
index 63b2202..5457ba4 100644
--- a/Examples/spark-sql/README.md
+++ b/Examples/spark-sql/README.md
@@ -7,7 +7,7 @@ This is an example Swift application to show how to develop a Spark SQL REPL(Rea
 Prepare `Spark Connect Server` via running Docker image.
 
 ```
-docker run -it --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
+docker run -it --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
 ```
 
 Build an application Docker image.
@@ -23,7 +23,7 @@ Run `spark-sql` docker image.
 
 ```
 $ docker run -it --rm -e SPARK_REMOTE=sc://host.docker.internal:15002 apache/spark-connect-swift:spark-sql
-Connected to Apache Spark 4.0.0-preview2 Server
+Connected to Apache Spark 4.0.0 Server
 spark-sql (default)> SHOW DATABASES;
 +---------+
 |namespace|
diff --git a/Examples/stream/README.md b/Examples/stream/README.md
index 3d0221a..2924358 100644
--- a/Examples/stream/README.md
+++ b/Examples/stream/README.md
@@ -5,7 +5,7 @@ This is an example Swift stream processing application to show how to count word
 ## Run `Spark Connect Server`
 
 ```bash
-docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
+docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
 ```
 
 ## Run `Netcat` as a streaming input server
diff --git a/Examples/web/README.md b/Examples/web/README.md
index c744ef2..788b504 100644
--- a/Examples/web/README.md
+++ b/Examples/web/README.md
@@ -77,7 +77,7 @@ index 2edcc8f..22313c8 100644
 Prepare `Spark Connect Server` via running Docker image.
 
 ```
-docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
+docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
 ```
 
 Build an application Docker image.
diff --git a/README.md b/README.md
index c24350f..6768a5b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 This is an experimental Swift library to show how to connect to a remote Apache Spark Connect Server and run SQL statements to manipulate remote data.
 
-So far, this library project is tracking the upstream changes like the [Apache Spark](https://spark.apache.org) 4.0.0 RC7 release and [Apache Arrow](https://arrow.apache.org) project's Swift-support.
+So far, this library project is tracking the upstream changes of [Apache Arrow](https://arrow.apache.org) project's Swift-support.
 
 ## Resources
 
@@ -16,7 +16,7 @@ So far, this library project is tracking the upstream changes like the [Apache S
 
 ## Requirement
 
-- [Apache Spark 4.0.0 RC7 (May 2025)](https://github.com/apache/spark/releases/tag/v4.0.0)
+- [Apache Spark 4.0.0 (May 2025)](https://github.com/apache/spark/releases/tag/v4.0.0)
 - [Swift 6.0 (2024) or 6.1 (2025)](https://swift.org)
 - [gRPC Swift 2.2 (May 2025)](https://github.com/grpc/grpc-swift/releases/tag/2.2.1)
 - [gRPC Swift Protobuf 1.3 (May 2025)](https://github.com/grpc/grpc-swift-protobuf/releases/tag/1.3.0)
diff --git a/Sources/SparkConnect/Documentation.docc/Examples.md b/Sources/SparkConnect/Documentation.docc/Examples.md
index 7999151..864e702 100644
--- a/Sources/SparkConnect/Documentation.docc/Examples.md
+++ b/Sources/SparkConnect/Documentation.docc/Examples.md
@@ -7,7 +7,7 @@ This document provides an overview of the example applications inside [Examples]
 Start a Spark Connect Server:
 
 ```bash
-docker run -it --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
+docker run -it --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
 ```
 
 ## Basic Application Example
@@ -147,7 +147,7 @@ Welcome to the Swift world. Say hello!%
 
 # Spark-powered endpoint
 curl http://127.0.0.1:8080/hello
-Hi, this is powered by the Apache Spark 4.0.0-preview2.%
+Hi, this is powered by the Apache Spark 4.0.0.%
 ```
 
 ## Development Environment