diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 18c83ec17a..961961557a 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -16,10 +16,6 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Get real Kafka version
-        id: get_real_version
-        run: |
-          echo "KAFKA_VERSION=$(echo ${{ github.ref_name }} | cut -d'-' -f1)" >> $GITHUB_OUTPUT
       - name: Checkout Code
         uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk }}
@@ -28,20 +24,21 @@ jobs:
           java-version: ${{ matrix.jdk }}
           distribution: "zulu"
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.12.0
+      - name: Get project version
+        id: get_project_version
+        run: |
+          project_version=$(./gradlew properties | grep "version:" | awk '{print $2}')
+          echo "PROJECT_VERSION=${project_version}" >> $GITHUB_OUTPUT
 
       - name: Build TarGz
         run: |
-          ./gradlew --build-cache --refresh-dependencies clean releaseTarGz
-      - name: Rename TarGz
-        run: |
-          mv ./core/build/distributions/kafka_2.13-${{ steps.get_real_version.outputs.KAFKA_VERSION }}.tgz ./core/build/distributions/kafka_2.13-${{ github.ref_name }}.tgz
-          mv ./core/build/distributions/kafka_2.13-${{ steps.get_real_version.outputs.KAFKA_VERSION }}-site-docs.tgz ./core/build/distributions/kafka_2.13-${{ github.ref_name }}-site-docs.tgz
+          ./gradlew -Pprefix=automq-${{ github.ref_name }}_ --build-cache --refresh-dependencies clean releaseTarGz
 
       # docker image release
       - name: Cp TarGz to Docker Path
         run: |
-          cp ./core/build/distributions/kafka_2.13-${{ github.ref_name }}.tgz ./docker/
+          cp ./core/build/distributions/automq-${{ github.ref_name }}_kafka-${{ steps.get_project_version.outputs.PROJECT_VERSION }}.tgz ./docker/
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 25a2243732..aef8b86567 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -16,10 +16,6 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Get real Kafka version
-        id: get_real_version
-        run: |
-          echo "KAFKA_VERSION=$(echo ${{ github.ref_name }} | cut -d'-' -f1)" >> $GITHUB_OUTPUT
       - name: Checkout Code
         uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk }}
@@ -28,15 +24,11 @@ jobs:
           java-version: ${{ matrix.jdk }}
           distribution: "zulu"
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.12.0
 
       - name: Build TarGz
         run: |
-          ./gradlew --build-cache --refresh-dependencies clean releaseTarGz
-      - name: Rename TarGz
-        run: |
-          mv ./core/build/distributions/kafka_2.13-${{ steps.get_real_version.outputs.KAFKA_VERSION }}.tgz ./core/build/distributions/kafka_2.13-${{ github.ref_name }}.tgz
-          mv ./core/build/distributions/kafka_2.13-${{ steps.get_real_version.outputs.KAFKA_VERSION }}-site-docs.tgz ./core/build/distributions/kafka_2.13-${{ github.ref_name }}-site-docs.tgz
+          ./gradlew -Pprefix=automq-${{ github.ref_name }}_ --build-cache --refresh-dependencies clean releaseTarGz
 
       - name: GitHub Release
         uses: softprops/action-gh-release@v1
@@ -44,4 +36,4 @@ jobs:
           draft: false
           generate_release_notes: true
           files: |
-            ./core/build/distributions/kafka_*.tgz
+            ./core/build/distributions/automq-*.tgz
diff --git a/automq_release.py b/automq_release.py
index 63d9c59af6..c6bf291857 100644
--- a/automq_release.py
+++ b/automq_release.py
@@ -140,12 +140,6 @@ def do_release(tag_version):
     cmd("Checking out to release branch", 'git checkout -b %s' % new_branch)
     print("Updating version numbers")
     release_version = tag_version.split("-")[0]
-    replace("gradle.properties", "version", "version=%s" % release_version)
-
-    print("updating E2E settings")
-    replace("tests/kafkatest/__init__.py", "__version__", "__version__ = '%s'" % release_version)
-    regexReplace("./tests/kafkatest/version.py", "^DEV_VERSION =.*",
-                 "DEV_VERSION = KafkaVersion(\"%s-SNAPSHOT\")" % release_version)
 
     print("updating docker compose")
     regexReplace("docker/docker-compose.yaml", "image: automqinc/kafka:.*$", "image: automqinc/kafka:%s" % tag_version)
diff --git a/build.gradle b/build.gradle
index 5af206dc89..cf3b74015b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1144,15 +1144,21 @@ project(':core') {
                                ':connect:runtime:genConnectMetricsDocs', ':connect:runtime:genConnectOpenAPIDocs',
                                ':connect:mirror:genMirrorSourceConfigDocs', ':connect:mirror:genMirrorCheckpointConfigDocs',
                                ':connect:mirror:genMirrorHeartbeatConfigDocs'], type: Tar) {
+    def prefix = project.findProperty('prefix') ?: ''
+    archiveBaseName = "${prefix}kafka"
+
     archiveClassifier = 'site-docs'
     compression = Compression.GZIP
     from project.file("$rootDir/docs")
-    into 'site-docs'
+    into "${prefix}kafka-${archiveVersion.get()}-site-docs"
     duplicatesStrategy 'exclude'
   }
 
   tasks.create(name: "releaseTarGz", dependsOn: configurations.archives.artifacts, type: Tar) {
-    into "kafka_${versions.baseScala}-${archiveVersion.get()}"
+    def prefix = project.findProperty('prefix') ?: ''
+    archiveBaseName = "${prefix}kafka"
+
+    into "${prefix}kafka-${archiveVersion.get()}"
     compression = Compression.GZIP
     from(project.file("$rootDir/bin")) { into "bin/" }
     from(project.file("$rootDir/config")) { into "config/" }
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3a1b8d89d1..bc7d2798e3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,7 +28,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     AWS_DEFAULT_REGION=us-east-1 \
     KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseZGC -XX:ZCollectionInterval=5"
 
-COPY "./kafka_*.tgz" /opt/kafka/kafka.tgz
+COPY "./automq-*.tgz" /opt/kafka/kafka.tgz
 RUN tar -xzvf "/opt/kafka/kafka.tgz" -C /opt/kafka/ --one-top-level=kafka --strip-components 1 && rm "/opt/kafka/kafka.tgz"
 COPY scripts /opt/kafka/scripts
 RUN chmod +x /opt/kafka/scripts/*.sh