diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39d9296..c874afc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           if [[ $GITHUB_REF_NAME == master ]] || [[ $GITHUB_REF_NAME == main ]]; then
             # when building master/main use :latest tag and the version number
             # from the cbpi/__init__.py file
-            VERSION=$(grep -o -E "(([0-9]{1,2}[.]?){3}[0-9]+)" cbpi/__init__.py)
+            VERSION=$(grep -o -E "(([0-9]{1,2}[.]?){2,3}[0-9]+)" cbpi/__init__.py)
             LATEST_IMAGE=${{ env.image-name }}:latest
             BUILD_CACHE_IMAGE_NAME=${LATEST_IMAGE}
             TAGS="${LATEST_IMAGE},${{ env.image-name }}:v${VERSION}"
diff --git a/README.md b/README.md
index cf2789f..9e47003 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # CraftBeerPi 4
 
-[![Build](https://github.com/avollkopf/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/avollkopf/craftbeerpi4/actions/workflows/build.yml)
-[![GitHub license](https://img.shields.io/github/license/avollkopf/craftbeerpi4)](https://github.com/avollkopf/craftbeerpi4/blob/master/LICENSE)
-![GitHub issues](https://img.shields.io/github/issues-raw/Manuel83/craftbeerpi4)
+[![Build](https://github.com/craftbeerpi/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/craftbeerpi/craftbeerpi4/actions/workflows/build.yml)
+[![GitHub license](https://img.shields.io/github/license/craftbeerpi/craftbeerpi4)](https://github.com/craftbeerpi/craftbeerpi4/blob/master/LICENSE)
+![GitHub issues](https://img.shields.io/github/issues-raw/craftbeerpi/craftbeerpi4)
 ![PyPI](https://img.shields.io/pypi/v/cbpi)
 ![Happy Brewing](https://img.shields.io/badge/CraftBeerPi%204-Happy%20Brewing-%23FBB117)
 
 <p align="center">
-  <img src="https://github.com/Manuel83/craftbeerpi4-ui/blob/main/cbpi4ui/public/logo192.png?raw=true" alt="CraftBeerPi Logo"/>
+  <img src="https://github.com/craftbeerpi/craftbeerpi4-ui/blob/main/cbpi4ui/public/logo192.png?raw=true" alt="CraftBeerPi Logo"/>
 </p>
 
 CraftBeerPi 4 is an open source software solution to control the brewing and
@@ -24,4 +24,4 @@ You can find a list of available plugins [here](https://openbrewing.gitbook.io/c
 ## 🧑‍🤝‍🧑 Contributers
 Thanks to all the people who have contributed
 
-[![contributors](https://contributors-img.web.app/image?repo=avollkopf/craftbeerpi4)](https://github.com/avollkopf/craftbeerpi4/graphs/contributors)
+[![contributors](https://contributors-img.web.app/image?repo=craftbeerpi/craftbeerpi4)](https://github.com/craftbeerpi/craftbeerpi4/graphs/contributors)