diff --git a/.env b/.env
index 2c6b315e..ec5084fe 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-DOCKER_TAG=v0.6.0-beta.1
+DOCKER_TAG=v0.6-latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9ccdd8ae..33137ec4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -32,11 +32,10 @@ jobs:
           TARGET_DOCKER_TAG=`git describe --tags --exact-match` || exit 1
           echo Selected tag ${TARGET_DOCKER_TAG}
           # Tag and push passed "k3d-iff.localhost:12345" with release tag
-          docker images
-          images=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep ":${TARGET_DOCKER_TAG}" | grep "k3d-iff.localhost")
+          images=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep k3d-iff | grep ${DOCKER_TAG} )
           echo I will push the following images: ${images}
           for image in $images; do
-            newimage=$(echo $image | sed -r "s/k3d-iff.localhost:12345/docker.io/g");
+            newimage=$(echo $image | sed -r "s/:${DOCKER_TAG}/:${TARGET_DOCKER_TAG}/g" | sed -r "s/k3d-iff.localhost:12345\///g");
             echo I will push image ${image} as ${newimage}
             docker tag ${image} ${newimage};
             docker push ${newimage};