diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile
index 3ad648e..a1dbc2c 100644
--- a/mod/apps-akka/Dockerfile
+++ b/mod/apps-akka/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 ARG TAG_COMMON_MESSAGE
 
diff --git a/mod/bbb-web/Dockerfile b/mod/bbb-web/Dockerfile
index b0f143c..277130a 100644
--- a/mod/bbb-web/Dockerfile
+++ b/mod/bbb-web/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 ARG TAG_COMMON_MESSAGE
 
diff --git a/mod/etherpad/settings.json b/mod/etherpad/settings.json
index 11442c6..892a155 100644
--- a/mod/etherpad/settings.json
+++ b/mod/etherpad/settings.json
@@ -198,8 +198,7 @@
 
   "dbType": "redis",
   "dbSettings": {
-    "host": "redis",
-    "port": 6379
+    "url": "redis://redis:6379"
   },
 
   /*
diff --git a/mod/freeswitch/Dockerfile b/mod/freeswitch/Dockerfile
index 6564607..280f6a9 100644
--- a/mod/freeswitch/Dockerfile
+++ b/mod/freeswitch/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 ARG TAG_FREESWITCH
 RUN mkdir -p /build/freeswitch && \
diff --git a/mod/fsesl-akka/Dockerfile b/mod/fsesl-akka/Dockerfile
index 61494d1..c72b6a9 100644
--- a/mod/fsesl-akka/Dockerfile
+++ b/mod/fsesl-akka/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 ARG TAG_COMMON_MESSAGE
 
diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile
index 92ebb7c..56b99f9 100644
--- a/mod/html5/Dockerfile
+++ b/mod/html5/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 # RUN groupadd -g 2000 meteor && useradd -m -u 2001 -g meteor meteor
 # USER meteor
diff --git a/mod/nginx/Dockerfile b/mod/nginx/Dockerfile
index 7e6922a..305cc4d 100644
--- a/mod/nginx/Dockerfile
+++ b/mod/nginx/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 # --------------------
 
diff --git a/mod/webrtc-sfu/Dockerfile b/mod/webrtc-sfu/Dockerfile
index 0eb4537..843c465 100644
--- a/mod/webrtc-sfu/Dockerfile
+++ b/mod/webrtc-sfu/Dockerfile
@@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
 
 
 RUN useradd --uid 2004 --user-group webrtc-sfu 
diff --git a/tags.env b/tags.env
index b53464f..c97e488 100644
--- a/tags.env
+++ b/tags.env
@@ -3,8 +3,8 @@
 # - docker-compose build
 
 
-# https://gitlab.senfcall.de/senfcall-public/docker-bbb-build
-BBB_BUILD_TAG=v2022-12-29-grails-524
+# https://hub.docker.com/r/bigbluebutton/bbb-build
+BBB_BUILD_TAG=bbb27-2023-06-13-java17
 
 # https://github.com/bigbluebutton/bigbluebutton
 TAG_COMMON_MESSAGE=v2.6.0