diff --git a/Dockerfile b/Dockerfile
index ec706f5..dab0f8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: opensuse/rust-keylime:%%KEYLIME_VERSION%%
-#!BuildTag: opensuse/rust-keylime:%%KEYLIME_VERSION%%-%RELEASE%
-#!BuildTag: opensuse/rust-keylime:latest
+#!BuildTag: opensuse/keylime-agent:%%KEYLIME_VERSION%%
+#!BuildTag: opensuse/keylime-agent:%%KEYLIME_VERSION%%-%RELEASE%
+#!BuildTag: opensuse/keylime-agent:latest
 FROM opensuse/tumbleweed:latest
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.rust-keylime
+# labelprefix=org.opensuse.application.keylime-agent
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Keylime Rust Agent Service Container Image"
 LABEL org.opencontainers.image.description="Keylime Rust agent service based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%KEYLIME_VERSION%%"
@@ -13,16 +13,16 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.authors="aplanas@suse.de"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/rust-keylime:%%KEYLIME_VERSION%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/keylime-agent:%%KEYLIME_VERSION%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-LABEL RUN="podman run --name rust-keylime-container --rm --device /dev/tpm0 --device /dev/tpmrm0 -v rust-keylime-volume:/var/lib/keylime -v rust-keylime-volume:/etc/keylime --tmpfs /var/lib/keylime/secure:rw,size=1m,mode=0700 -dt IMAGE"
-LABEL INSTALL="podman volume create rust-keylime-volume"
-LABEL CONFIGURE="podman run --rm -v rust-keylime-volume:/var/lib/keylime -v rust-keylime-volume:/etc/keylime IMAGE /rust-keylime-configure.sh"
-LABEL UNINSTALL="podman volume rm rust-keylime-volume"
+LABEL RUN="podman run --name keylime-agent-container --rm --device /dev/tpm0 --device /dev/tpmrm0 -v keylime-agent-volume:/var/lib/keylime -v keylime-agent-volume:/etc/keylime --tmpfs /var/lib/keylime/secure:rw,size=1m,mode=0700 -dt IMAGE"
+LABEL INSTALL="podman volume create keylime-agent-volume"
+LABEL CONFIGURE="podman run --rm -v keylime-agent-volume:/var/lib/keylime -v keylime-agent-volume:/etc/keylime IMAGE /keylime-agent-configure.sh"
+LABEL UNINSTALL="podman volume rm keylime-agent-volume"
 
 RUN set -euo pipefail; \
     zypper -n in --no-recommends \
@@ -31,9 +31,9 @@ RUN set -euo pipefail; \
     zypper -n clean; \
     rm -rf /var/log/*
 
-COPY rust-keylime-configure.sh /
+COPY keylime-agent-configure.sh /
 RUN set -euo pipefail; \
-    chmod a+x rust-keylime-configure.sh
+    chmod a+x keylime-agent-configure.sh
 
 ENV UUID="<UUID>" REMOTE_IP="<REMOTE_IP>" RUST_LOG="keylime_agent=info"
 
diff --git a/rust-keylime-configure.sh b/keylime-agent-configure.sh
similarity index 100%
rename from rust-keylime-configure.sh
rename to keylime-agent-configure.sh
diff --git a/rust-keylime-image.changes b/rust-keylime-image.changes
index dc4dc5b..125fc4a 100644
--- a/rust-keylime-image.changes
+++ b/rust-keylime-image.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct 28 12:51:07 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Rename the published image to "keylime-agent"
+- Rename the volumes and container default name, and the configuration
+  file under "keylime-agent-XXXX"
+
 -------------------------------------------------------------------
 Thu Oct 20 11:03:57 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>