diff --git a/.github/workflows/publish-docker-on-main.yml b/.github/workflows/publish-docker-on-main.yml
index 79c91d8c..bc1438f7 100644
--- a/.github/workflows/publish-docker-on-main.yml
+++ b/.github/workflows/publish-docker-on-main.yml
@@ -22,8 +22,8 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.GHCR_USER }}
+          password: ${{ secrets.GHCR_TOKEN }}
 
       - name: Build and push Docker image
         run: |
diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml
index 8570a4e3..92995e5d 100644
--- a/.github/workflows/release-on-tag.yml
+++ b/.github/workflows/release-on-tag.yml
@@ -25,29 +25,28 @@ jobs:
               exit 1
           fi
 
-      - name: Build Fablo
-        run: |
-          shellcheck --version
-          yamllint -v
-          npm install
-          ./fablo-build.sh
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+      - name: Login to GHCR
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_LOGIN }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_USER }}
+          password: ${{ secrets.GHCR_TOKEN }}
 
-      - name: Publish Docker image
+      - name: Build and push Docker image
         run: |
-          FABLO_VERSION=$(jq -r '.version' <"$GITHUB_WORKSPACE/package.json")
-          docker push ghcr.io/hyperledger-labs/fablo:"$FABLO_VERSION"
+          shellcheck --version
+          yamllint -v
+          npm install
+          ./fablo-build.sh --push
 
-      - name: Create GitHub Release
-        uses: "marvinpinto/action-automatic-releases@latest"
+      - name: Create release
+        uses: softprops/action-gh-release@v2
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
           files: |
             docs/schema.json
             fablo.sh
diff --git a/fablo-build.sh b/fablo-build.sh
index a261521a..be08ec90 100755
--- a/fablo-build.sh
+++ b/fablo-build.sh
@@ -15,7 +15,7 @@ echo "   FABLO_HOME:    $FABLO_HOME"
 echo "   FABLO_VERSION: $FABLO_VERSION"
 echo "   VERSION_DETAILS: $VERSION_DETAILS"
 
-IMAGE_BASE_NAME="ghcr.io/hyperledger-labs/fablo:$FABLO_VERSION"
+IMAGE_BASE_NAME="ghcr.io/fablo-io/fablo:$FABLO_VERSION"
 
 if [ "$(command -v nvm)" != "nvm" ] && [ -f ~/.nvm/nvm.sh ]; then
   set +e
@@ -37,7 +37,7 @@ if [ "${1:-''}" = "--push" ]; then
   docker buildx build \
     --build-arg VERSION_DETAILS="$VERSION_DETAILS" \
     --platform linux/amd64,linux/arm64 \
-    --tag "ghcr.io/hyperledger-labs/fablo:$FABLO_VERSION" \
+    --tag "ghcr.io/fablo-io/fablo:$FABLO_VERSION" \
     --push \
     "$FABLO_HOME"
 else
@@ -45,5 +45,5 @@ else
     --build-arg VERSION_DETAILS="$VERSION_DETAILS" \
     --tag "$IMAGE_BASE_NAME" "$FABLO_HOME"
 
-  docker tag "$IMAGE_BASE_NAME" "ghcr.io/hyperledger-labs/fablo:$FABLO_VERSION"
+  docker tag "$IMAGE_BASE_NAME" "ghcr.io/fablo-io/fablo:$FABLO_VERSION"
 fi
diff --git a/fablo.sh b/fablo.sh
index cc3a4388..ac6dbaea 100755
--- a/fablo.sh
+++ b/fablo.sh
@@ -3,7 +3,7 @@
 set -e
 
 FABLO_VERSION=1.2.1-unstable.0
-FABLO_IMAGE_NAME="ghcr.io/hyperledger-labs/fablo"
+FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo"
 FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"
 
 COMMAND="$1"