diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 2d47f77553..d7959bdbfc 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -1,4 +1,4 @@
-name: Release
+name: Docker Release
 
 on:
   push:
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 2f21121d8b..abbbb05b38 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -1,9 +1,9 @@
-name: Release
+name: Github Release
 
 on:
   push:
     tags:
-      - '[0-9]+\.[0-9]+\.[0-9]+\-?[a-zA-Z]*'
+      - '[0-9]+\.[0-9]+\.[0-9]+'
 
 jobs:
   github-release:
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index c238bac31f..a61c5b8f64 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -52,7 +52,7 @@ services:
   controller:
     container_name: "${CONTROLLER_DOCKER_NAME-controller}"
     hostname: "${CONTROLLER_DOCKER_NAME-controller}"
-    image: automqinc/kos:3.4.0
+    image: automqinc/kafka:0.6.6
     environment:
       - KAFKA_S3_ACCESS_KEY=test
       - KAFKA_S3_SECRET_KEY=test
@@ -69,7 +69,7 @@ services:
   broker1:
     container_name: "${BROKER1_DOCKER_NAME-broker1}"
     hostname: "${BROKER1_DOCKER_NAME-broker1}"
-    image: automqinc/kos:3.4.0
+    image: automqinc/kafka:0.6.6
     environment:
       - KAFKA_S3_ACCESS_KEY=test
       - KAFKA_S3_SECRET_KEY=test
@@ -85,7 +85,7 @@ services:
   broker2:
     container_name: "${BROKER2_DOCKER_NAME-broker2}"
     hostname: "${BROKER2_DOCKER_NAME-broker2}"
-    image: automqinc/kos:3.4.0
+    image: automqinc/kafka:0.6.6
     environment:
       - KAFKA_S3_ACCESS_KEY=test
       - KAFKA_S3_SECRET_KEY=test