diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e42d4faffc..9e6c5ac2613 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1149,8 +1149,8 @@ set(CPACK_PACKAGE_VERSION ${FLB_VERSION_STR})
 set(CPACK_PACKAGE_NAME "fluent-bit")
 
 set(CPACK_PACKAGE_RELEASE 1)
-set(CPACK_PACKAGE_CONTACT "Eduardo Silva <eduardo@calyptia.com>")
-set(CPACK_PACKAGE_VENDOR "Calyptia Inc.")
+set(CPACK_PACKAGE_CONTACT "Eduardo Silva <eduardo.silva@chronosphere.io>")
+set(CPACK_PACKAGE_VENDOR "Chronosphere Inc.")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGING_INSTALL_PREFIX "/")
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index a97bc49ad34..9a4a68f5a14 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,12 +4,12 @@ Fluent Bit is developed and supported by many individuals and companies.  The fo
 
 | Maintainer Name                                       | Components               | Company                                           |
 | :---------------------------------------------------- | ------------------------ | ------------------------------------------------- |
-| [Eduardo Silva](https://github.com/edsiper)           | All                      | [Calyptia](https://calyptia.com)                  |
-| [Leonardo Alminana](https://github.com/leonardo-albertovich) | All               | [Calyptia](https://calyptia.com)                  |
+| [Eduardo Silva](https://github.com/edsiper)           | All                      | [Chronosphere](https://chronosphere.io)                  |
+| [Leonardo Alminana](https://github.com/leonardo-albertovich) | All               | [Chronosphere](https://chronosphere.io)                  |
 | [Masoud Koleini](https://github.com/koleini)          | Stream Processor         | [Arm](https://www.arm.com/)                       |
-| [Hiroshi Hatake](https://github.com/cosmo0920)        | All                      | [Calyptia](https://calyptia.com)                  |
+| [Hiroshi Hatake](https://github.com/cosmo0920)        | All                      | [Chronosphere](https://chronosphere.io)                  |
 | [Fujimoto Seiji](https://github.com/fujimotos)        | Windows Platform         | Individual                                        |
 | [Wesley Pettit](https://github.com/PettitWesley)      | Amazon Plugins (AWS)     | [Amazon Web Services](https://aws.amazon.com/)    |
 | [Cedric Lamoriniere](https://github.com/clamoriniere) | Datadog Output Plugin    | [Datadog](https://www.datadoghq.com/)             |
 | [Jonathan Gonzalez V.](https://github.com/sxd)        | PostgreSQL Output Plugin | [2ndQuadrant](https://www.2ndquadrant.com/en/)    |
-| [Jorge Niedbalski](https://github.com/niedbalski)     | CI && Containers         | [Calyptia](https://calyptia.com/)                 |
+| [Jorge Niedbalski](https://github.com/niedbalski)     | CI && Containers         | [Personal Blog](https://niedbalski.dev/)                 |
diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index feb84bb49d1..d092690c33f 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -160,7 +160,7 @@ ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
 LABEL description="Fluent Bit multi-architecture container image" \
     vendor="Fluent Organization" \
     version="${RELEASE_VERSION}" \
-    author="Eduardo Silva <eduardo@calyptia.com>" \
+    author="Eduardo Silva <eduardo.silva@chronosphere.io>" \
     org.opencontainers.image.description="Fluent Bit container image" \
     org.opencontainers.image.title="Fluent Bit" \
     org.opencontainers.image.licenses="Apache-2.0" \
@@ -168,7 +168,7 @@ LABEL description="Fluent Bit multi-architecture container image" \
     org.opencontainers.image.version="${RELEASE_VERSION}" \
     org.opencontainers.image.source="https://github.com/fluent/fluent-bit" \
     org.opencontainers.image.documentation="https://docs.fluentbit.io/" \
-    org.opencontainers.image.authors="Eduardo Silva <eduardo@calyptia.com>"
+    org.opencontainers.image.authors="Eduardo Silva <eduardo.silva@chronosphere.io>"
 
 # Copy the libraries from the extractor stage into root
 COPY --from=deb-extractor /dpkg /
@@ -191,7 +191,7 @@ ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
 LABEL description="Fluent Bit multi-architecture debug container image" \
     vendor="Fluent Organization" \
     version="${RELEASE_VERSION}-debug" \
-    author="Eduardo Silva <eduardo@calyptia.com>" \
+    author="Eduardo Silva <eduardo.silva@chronosphere.io>" \
     org.opencontainers.image.description="Fluent Bit debug container image" \
     org.opencontainers.image.title="Fluent Bit Debug" \
     org.opencontainers.image.licenses="Apache-2.0" \
@@ -199,7 +199,7 @@ LABEL description="Fluent Bit multi-architecture debug container image" \
     org.opencontainers.image.version="${RELEASE_VERSION}-debug" \
     org.opencontainers.image.source="https://github.com/fluent/fluent-bit" \
     org.opencontainers.image.documentation="https://docs.fluentbit.io/" \
-    org.opencontainers.image.authors="Eduardo Silva <eduardo@calyptia.com>"
+    org.opencontainers.image.authors="Eduardo Silva <eduardo.silva@chronosphere.io>"
 
 COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/
 COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
diff --git a/dockerfiles/Dockerfile.windows b/dockerfiles/Dockerfile.windows
index 8ffefe78e55..da6ff079014 100644
--- a/dockerfiles/Dockerfile.windows
+++ b/dockerfiles/Dockerfile.windows
@@ -99,7 +99,7 @@ LABEL org.opencontainers.image.title="Fluent Bit" `
     org.opencontainers.image.description="Fluent Bit is an open source and multi-platform Log Processor and Forwarder which allows you to collect data/logs from different sources, unify and send them to multiple destinations. It's fully compatible with Docker and Kubernetes environments." `
     org.opencontainers.image.created=$IMAGE_CREATE_DATE `
     org.opencontainers.image.version=$FLUENTBIT_VERSION `
-    org.opencontainers.image.authors="Eduardo Silva <eduardo@calyptia.com>" `
+    org.opencontainers.image.authors="Eduardo Silva <eduardo.silva@chronosphere.io>" `
     org.opencontainers.image.url="https://hub.docker.com/r/fluent/fluent-bit" `
     org.opencontainers.image.documentation="https://docs.fluentbit.io/manual/" `
     org.opencontainers.image.vendor="Fluent Organization" `