diff --git a/Dockerfile b/Dockerfile
index 1f09dfa6c6..7571d0f3a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,30 +2,29 @@
 # you want to build an image from source without
 # pnpm and Go installed on your dev machine.
 
-# You can build oCIS using this Dockerfile
+# You can build OpenCloud using this Dockerfile
 # by running following command:
-# `docker build -t owncloud/ocis:custom .`
+# `docker build -t opencloud/opencloud:custom .`
 
 # In most other cases you might want to run the
 # following command instead:
-# `make -C ocis dev-docker`
-# It will build a `owncloud/ocis:dev` image for you
+# `make -C opencloud dev-docker`
+# It will build a `opencloud/opencloud:dev` image for you
 # and use your local pnpm and Go caches and therefore
 # is a lot faster than the build steps below.
 
 
 FROM owncloudci/nodejs:18 AS generate
 
-COPY ./ /ocis/
+COPY ./ /opencloud/
 
-WORKDIR /ocis/ocis
-RUN make ci-node-generate
+WORKDIR /opencloud/opencloud
 
 FROM owncloudci/golang:1.22 AS build
 
-COPY --from=generate /ocis /ocis
+COPY --from=generate /opencloud /opencloud
 
-WORKDIR /ocis/ocis
+WORKDIR /opencloud/opencloud
 RUN make ci-go-generate build ENABLE_VIPS=true
 
 FROM alpine:3.20
@@ -33,10 +32,14 @@ FROM alpine:3.20
 RUN apk add --no-cache attr ca-certificates curl mailcap tree vips && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
-LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-	org.label-schema.name="ownCloud Infinite Scale" \
-	org.label-schema.vendor="ownCloud GmbH" \
-	org.label-schema.schema-version="1.0"
+LABEL maintainer="OpenCloud GmbH <devops@opencloud.eu>" \
+        org.opencontainers.image.title="OpenCloud" \
+        org.opencontainers.image.vendor="OpenCloud GmbH" \
+        org.opencontainers.image.authors="OpenCloud GmbH" \
+        org.opencontainers.image.description="OpenCloud is a modern file-sync and share platform" \
+        org.opencontainers.image.licenses="Apache-2.0" \
+        org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \
+        org.opencontainers.image.source="https://github.com/opencloud-eu/opencloud"
 
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]
diff --git a/opencloud/docker/Dockerfile.linux.amd64 b/opencloud/docker/Dockerfile.linux.amd64
index b7b18e34ff..17f07fac02 100644
--- a/opencloud/docker/Dockerfile.linux.amd64
+++ b/opencloud/docker/Dockerfile.linux.amd64
@@ -7,10 +7,10 @@ RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="openCloud GmbH <devops@opencloud.eu>" \
-  org.opencontainers.image.title="OpenCloud Pulse" \
+  org.opencontainers.image.title="OpenCloud" \
   org.opencontainers.image.vendor="OpenCloud GmbH" \
   org.opencontainers.image.authors="OpenCloud GmbH" \
-  org.opencontainers.image.description="opencloud - OpenCloud Pulse is a modern file-sync and share platform" \
+  org.opencontainers.image.description="OpenCloud is a modern file-sync and share platform" \
   org.opencontainers.image.licenses="Apache-2.0" \
   org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \
   org.opencontainers.image.url="https://hub.docker.com/r/opencloud-eu/opencloud" \
diff --git a/opencloud/docker/Dockerfile.linux.arm64 b/opencloud/docker/Dockerfile.linux.arm64
index 3d0d4ce7be..16fb50073c 100644
--- a/opencloud/docker/Dockerfile.linux.arm64
+++ b/opencloud/docker/Dockerfile.linux.arm64
@@ -7,10 +7,10 @@ RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="openCloud GmbH <devops@opencloud.eu>" \
-  org.opencontainers.image.title="OpenCloud Pulse" \
+  org.opencontainers.image.title="OpenCloud" \
   org.opencontainers.image.vendor="OpenCloud GmbH" \
   org.opencontainers.image.authors="OpenCloud GmbH" \
-  org.opencontainers.image.description="OpenCloud - OpenCloud Pulse is a modern file-sync and share platform" \
+  org.opencontainers.image.description="OpenCloud a modern file-sync and share platform" \
   org.opencontainers.image.licenses="Apache-2.0" \
   org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \
   org.opencontainers.image.url="https://hub.docker.com/r/opencloud-eu/opencloud" \
diff --git a/opencloud/docker/Dockerfile.linux.debug.amd64 b/opencloud/docker/Dockerfile.linux.debug.amd64
index d679c92d41..baf67c89bd 100644
--- a/opencloud/docker/Dockerfile.linux.debug.amd64
+++ b/opencloud/docker/Dockerfile.linux.debug.amd64
@@ -7,10 +7,10 @@ RUN apk add --no-cache attr bash ca-certificates curl delve inotify-tools libc6-
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="OpenCloud GmbH <devops@opencloud.eu>" \
-  org.opencontainers.image.title="OpenCloud Pulse" \
+  org.opencontainers.image.title="OpenCloud" \
   org.opencontainers.image.vendor="OpenCloud GmbH" \
   org.opencontainers.image.authors="OpenCloud GmbH" \
-  org.opencontainers.image.description="OpenCloud - OpenCloud Pulse is a modern file-sync and share platform" \
+  org.opencontainers.image.description="OpenCloud is a modern file-sync and share platform" \
   org.opencontainers.image.licenses="Apache-2.0" \
   org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \
   org.opencontainers.image.url="https://hub.docker.com/r/opencloud-eu/opencloud" \