diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e81923..23e8dda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,5 +82,5 @@ jobs:
           docker run --privileged --rm tonistiigi/binfmt --install all
           podman manifest create build
           podman build --format docker --platform linux/amd64,linux/arm64,linux/arm/v7 --manifest localhost/build .
-          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:${EPOCHSECONDS}-rootless-ci
+          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:${EPOCHSECONDS}-ci
 
diff --git a/.github/workflows/release-dev-version.yml b/.github/workflows/release-dev-version.yml
index 9bb7a04..8581b3d 100644
--- a/.github/workflows/release-dev-version.yml
+++ b/.github/workflows/release-dev-version.yml
@@ -85,5 +85,5 @@ jobs:
           docker run --privileged --rm tonistiigi/binfmt --install all
           podman manifest create build
           podman build --format docker --build-arg BUILD_VERSION_ARG=${VERSION} --manifest localhost/build --platform linux/amd64,linux/arm64,linux/arm/v7 .
-          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:${VERSION}-rootless-dev
-          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:latest-rootless-dev
+          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:${VERSION}-dev
+          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:latest-dev
diff --git a/.github/workflows/release-productive-version.yml b/.github/workflows/release-productive-version.yml
index b5c8ad9..357818c 100644
--- a/.github/workflows/release-productive-version.yml
+++ b/.github/workflows/release-productive-version.yml
@@ -85,5 +85,5 @@ jobs:
           docker run --privileged --rm tonistiigi/binfmt --install all
           podman manifest create build
           podman build --format docker --build-arg BUILD_VERSION_ARG=${VERSION} --manifest localhost/build --platform linux/amd64,linux/arm64,linux/arm/v7 .
-          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:${VERSION}-rootless
-          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:rootless-latest
+          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:${VERSION}
+          podman manifest push localhost/build docker://docker.io/bbernhard/signal-cli-rest-api:latest