diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 67e9d0cb..88a41e4e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,7 +30,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: marlonetheredgeuibk/cirrina
+          images: collaborativestatemachines/cirrina
           tags: |
             type=semver,pattern={{version}},enable=${{ github.event_name == 'release' }}
             type=raw,value=stable,enable=${{ github.event_name == 'release' }}
diff --git a/README.md b/README.md
index 14a63140..35e375a3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </div>
 <br>
 
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE.md) [![Build](https://github.com/UIBK-DPS-DC/Cirrina/actions/workflows/build.yml/badge.svg?event=push)](https://github.com/UIBK-DPS-DC/Cirrina/actions/workflows/build.yml?event=push) [![Docker Image Version (tag)](https://img.shields.io/docker/v/marlonetheredgeuibk/cirrina/unstable?color=red)](https://hub.docker.com/repository/docker/marlonetheredgeuibk/cirrina/tags/unstable/) [![Docker Image Version (tag)](https://img.shields.io/docker/v/marlonetheredgeuibk/cirrina/stable?color=blue)](https://hub.docker.com/repository/docker/marlonetheredgeuibk/cirrina/tags/stable/)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE.md) [![Build](https://github.com/UIBK-DPS-DC/Cirrina/actions/workflows/build.yml/badge.svg?event=push)](https://github.com/UIBK-DPS-DC/Cirrina/actions/workflows/build.yml?event=push) [![Docker Image Version (tag)](https://img.shields.io/docker/v/collaborativestatemachines/cirrina/unstable?color=red)](https://hub.docker.com/repository/docker/collaborativestatemachines/cirrina/tags/unstable/) [![Docker Image Version (tag)](https://img.shields.io/docker/v/collaborativestatemachines/cirrina/stable?color=blue)](https://hub.docker.com/repository/docker/collaborativestatemachines/cirrina/tags/stable/)
 
 Cirrina, a distributed Collaborative State Machines (CSM) runtime for the Cloud-Edge-IoT continuum.
 Collaborative State Machines is a state machine-based programming model for the Cloud-Edge-IoT