diff --git a/.github/workflows/build-addon.yml b/.github/workflows/build-addon.yml
index c4bebf3..13a3092 100644
--- a/.github/workflows/build-addon.yml
+++ b/.github/workflows/build-addon.yml
@@ -109,7 +109,6 @@ jobs:
             --java-execution-environment=JavaSE-17 \
             $(find . -type f -name "Main.java") \
             /tmp/capella_${{ matrix.capella.version }}
-          cat .classpath
       - name: Build workspace
         run: |-
           cd ${{ matrix.addon }}
@@ -124,17 +123,15 @@ jobs:
           cd ${{ matrix.addon }}
           python ../capella_addons/__main__.py -v \
           package \
-          /usr/lib/jvm/${{ matrix.capella.jdk.name }} \
-          /usr/lib/jvm/jdk-17.0.6+10 \
-          /tmp/jdtls
+          /usr/lib/jvm/jdk-17.0.6+10
       - name: Create release
         id: create_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          tag_name: ${{ matrix.addon }}.${{ github.ref }}
+          release_name: ${{ matrix.addon }} ${{ github.ref }}
           draft: false
           prerelease: false
       - name: Publish release
diff --git a/capella_addons/__main__.py b/capella_addons/__main__.py
index 2f25ca8..0769c27 100644
--- a/capella_addons/__main__.py
+++ b/capella_addons/__main__.py
@@ -608,6 +608,7 @@ def build_workspace(
             status = response.get("result", BuildWorkspaceStatus.FAILED.value)
             if status == BuildWorkspaceStatus.SUCCEED.value:
                 click.echo("Build of workspace succeeded.")
+                sys.exit(0)
             elif status == BuildWorkspaceStatus.CANCELLED.value:
                 click.echo("Build of workspace cancelled.")
             elif status == BuildWorkspaceStatus.WITH_ERROR.value: