diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index a1dd754..b6bf54d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -41,7 +41,6 @@ jobs:
 
   Test-Java-21:
     runs-on: ubuntu-latest
-    continue-on-error: true
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
diff --git a/.github/workflows/platform-nightly.yml b/.github/workflows/platform-nightly.yml
index f344bae..68057e8 100644
--- a/.github/workflows/platform-nightly.yml
+++ b/.github/workflows/platform-nightly.yml
@@ -52,23 +52,19 @@ jobs:
           chmod +x ./scripts/github_action.sh
           ./scripts/github_action.sh "eclipse-edc" "connector" "nightly.yml" "" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}"
 
-  IdentityHub-FederatedCatalog:
+  IdentityHub:
     runs-on: ubuntu-latest
     needs: [ Connector ]
-    strategy:
-      fail-fast: false
-      matrix:
-        repository: [ "identityhub", "federatedcatalog" ]
     steps:
       - uses: actions/checkout@v6
-      - name: ${{ matrix.repository }} ${{ needs.Determine-Version.outputs.VERSION }}
+      - name: IdentityHub ${{ needs.Determine-Version.outputs.VERSION }}
         run: |
           chmod +x ./scripts/github_action.sh
-          ./scripts/github_action.sh "eclipse-edc" "${{ matrix.repository }}" "nightly.yml" "" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}"
+          ./scripts/github_action.sh "eclipse-edc" "identityhub" "nightly.yml" "" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}"
 
   Technology:
     runs-on: ubuntu-latest
-    needs: [ IdentityHub-FederatedCatalog ]
+    needs: [ IdentityHub ]
     continue-on-error: true
     strategy:
       fail-fast: false
diff --git a/.github/workflows/platform-prepare-release.yml b/.github/workflows/platform-prepare-release.yml
index 3620abf..914bb81 100644
--- a/.github/workflows/platform-prepare-release.yml
+++ b/.github/workflows/platform-prepare-release.yml
@@ -42,19 +42,15 @@ jobs:
           chmod +x ./scripts/github_action.sh
           ./scripts/github_action.sh "eclipse-edc" "connector" "prepare-release.yml" "{\"version\": \"${{ inputs.version }}\"}" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}" "${{ inputs.branch }}"
 
-  IdentityHub-FederatedCatalog:
+  IdentityHub:
     runs-on: ubuntu-latest
     needs: [ Connector ]
-    strategy:
-      fail-fast: false
-      matrix:
-        repository: [ "identityhub", "federatedcatalog" ]
     steps:
       - uses: actions/checkout@v6
-      - name: ${{ matrix.repository }} ${{ inputs.version }}
+      - name: IdentityHub ${{ inputs.version }}
         run: |
           chmod +x ./scripts/github_action.sh
-          ./scripts/github_action.sh "eclipse-edc" "${{ matrix.repository }}" "prepare-release.yml" "{\"version\": \"${{ inputs.version }}\"}" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}" "${{ inputs.branch }}"
+          ./scripts/github_action.sh "eclipse-edc" "identityhub" "prepare-release.yml" "{\"version\": \"${{ inputs.version }}\"}" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}" "${{ inputs.branch }}"
 
   Technology:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/platform-release.yml b/.github/workflows/platform-release.yml
index 2e19d6c..b1d9a1c 100644
--- a/.github/workflows/platform-release.yml
+++ b/.github/workflows/platform-release.yml
@@ -43,19 +43,15 @@ jobs:
           chmod +x ./scripts/github_action.sh
           ./scripts/github_action.sh "eclipse-edc" "connector" "release.yml" "" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}" "${{ inputs.branch }}"
 
-  IdentityHub-FederatedCatalog:
+  IdentityHub:
     runs-on: ubuntu-latest
     needs: [ Connector ]
-    strategy:
-      fail-fast: false
-      matrix:
-        repository: [ "identityhub", "federatedcatalog" ]
     steps:
       - uses: actions/checkout@v6
-      - name: ${{ matrix.repository }} ${{ inputs.branch }}
+      - name: IdentityHub ${{ inputs.branch }}
         run: |
           chmod +x ./scripts/github_action.sh
-          ./scripts/github_action.sh "eclipse-edc" "${{ matrix.repository }}" "release.yml" "" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}" "${{ inputs.branch }}"
+          ./scripts/github_action.sh "eclipse-edc" "identityhub" "release.yml" "" "${{ secrets.ORG_GITHUB_BOT_USER }}" "${{ secrets.ORG_GITHUB_BOT_TOKEN }}" "${{ inputs.branch }}"
 
   Technology:
     runs-on: ubuntu-latest