diff --git a/.env b/.env
index 86d1ac3ee..1e4caa192 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
 # Env variables for docker-compose.yaml
-EDC_IMAGE=ghcr.io/sovity/edc-dev:7.5.0
-TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:7.5.0
+EDC_IMAGE=ghcr.io/sovity/edc-dev:8.0.0
+TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:8.0.0
 EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:3.2.2
 EDC_UI_ACTIVE_PROFILE=sovity-open-source
-BROKER_IMAGE=ghcr.io/sovity/broker-server-dev:4.2.0
+BROKER_IMAGE=ghcr.io/sovity/broker-server-dev:8.0.0
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
index f9fc041b3..2887a4154 100644
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@@ -46,6 +46,8 @@ Feel free to edit this release checklist in-progress depending on what tasks nee
         the [docker-compose's .env file](https://github.com/sovity/edc-extensions/blob/main/.env).
   - [ ] Set the version for `TEST_BACKEND_IMAGE` of
         the [docker-compose's .env file](https://github.com/sovity/edc-extensions/blob/main/.env).
+  - [ ] Set the version for `BROKER_IMAGE` of
+    the [docker-compose's .env file](https://github.com/sovity/edc-extensions/blob/main/.env).
   - [ ] Set the UI release version for `EDC_UI_IMAGE` of
         the [docker-compose's .env file](https://github.com/sovity/edc-extensions/blob/main/.env).
   - [ ] If the Eclipse EDC version changed, update
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4569d8a08..b6c4a2bc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,22 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 ### Overview
 
+### EDC UI
+
+### EDC Extensions and Broker
+
+#### Major Changes
+
+#### Minor Changes
+
+#### Patch Changes
+
+### Deployment Migration Notes
+
+## [8.0.0] - 2024-06-05
+
+### Overview
+
 Starting from version `8`, the Broker has been merged with the Community edition.
 
 [The former changelog](https://github.com/sovity/edc-broker-server-extension/blob/main/CHANGELOG.md) for the Broker is still available but will not be updated anymore.
@@ -17,17 +33,20 @@ The functionalities of each part, Broker and Extensions, on this release, is the
 
 ### EDC UI
 
-### EDC Extensions and Broker
-
-#### Major Changes
-
-#### Minor Changes
+- https://github.com/sovity/edc-ui/releases/tag/v3.2.2
 
 #### Patch Changes
 
 - Overhaul of the Postman-Collection
 
-### Deployment Migration Notes
+#### Compatible Versions
+
+- Connector Backend Docker Images:
+  - Dev EDC: `ghcr.io/sovity/edc-dev:8.0.0`
+  - sovity EDC CE: `ghcr.io/sovity/edc-ce:8.0.0`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:8.0.0`
+- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:3.2.2`
+
 
 ## [7.5.0] - 2024-05-16
 
diff --git a/archived/broker/README.md b/archived/broker/README.md
index 99582f89b..4bf00c932 100644
--- a/archived/broker/README.md
+++ b/archived/broker/README.md
@@ -116,7 +116,7 @@ Mid-development it might be un-pinned back to latest versions.
 
 ## Releasing
 
-[Create a Release Issue](https://github.com/sovity/edc-broker-server-extension/issues/new?assignees=&labels=task%2Frelease%2Cscope%2Fmds&projects=&template=release.md&title=Release+x.x.x) and follow the instructions.
+[Create a Release Issue](https://github.com/sovity/edc-extensions/issues/new?assignees=&labels=task%2Frelease%2Cscope%2Fmds&projects=&template=release.md&title=Release+x.x.x) and follow the instructions.
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index a4eb98afd..0789fdcfb 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -159,6 +159,11 @@ services:
       - '54321:5432'
     volumes:
       - 'postgresql:/bitnami/postgresql'
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U edc" ]
+      interval: 1s
+      timeout: 5s
+      retries: 10
 
   postgresql2:
     image: docker.io/bitnami/postgresql:15
@@ -171,6 +176,11 @@ services:
       - '54322:5432'
     volumes:
       - 'postgresql2:/bitnami/postgresql'
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U edc" ]
+      interval: 1s
+      timeout: 5s
+      retries: 10
 
   broker-postgresql:
     image: docker.io/bitnami/postgresql:15
@@ -183,6 +193,11 @@ services:
       - '54323:5432'
     volumes:
       - 'broker-postgresql:/bitnami/postgresql'
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U edc"]
+      interval: 1s
+      timeout: 5s
+      retries: 10
 
 volumes:
   postgresql:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c776e7f9e..0789fdcfb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -116,6 +116,10 @@ services:
     depends_on:
       broker-postgresql:
         condition: service_healthy
+      edc:
+        condition: service_started
+      edc2:
+        condition: service_started
     environment:
       EDC_BROKER_SERVER_KNOWN_CONNECTORS: "http://edc:11003/api/dsp,http://edc2:11003/api/dsp"
       EDC_BROKER_SERVER_KNOWN_DATASPACE_CONNECTORS: "Mobilithek=https://some-other-connector/api/dsp"