diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index 9625898..a65ec62 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -156,7 +156,7 @@ services:
 
   etherpad:
     build: mod/etherpad
-    image: alangecker/bbb-docker-etherpad:1.8.18
+    image: alangecker/bbb-docker-etherpad:1.8.18-2
     restart: unless-stopped
     depends_on:
       - redis
diff --git a/mod/bbb-pads/bbb-pads b/mod/bbb-pads/bbb-pads
index 032931f..3eb45a5 160000
--- a/mod/bbb-pads/bbb-pads
+++ b/mod/bbb-pads/bbb-pads
@@ -1 +1 @@
-Subproject commit 032931f916b42eed116dfc20eb153cfb0f487aeb
+Subproject commit 3eb45a5099fc3e9def055a8d236e52098777eb95
diff --git a/mod/etherpad/Dockerfile b/mod/etherpad/Dockerfile
index c9f7ddd..7573eed 100644
--- a/mod/etherpad/Dockerfile
+++ b/mod/etherpad/Dockerfile
@@ -8,10 +8,11 @@ RUN apt-get update \
 USER etherpad
 
 RUN npm install  \
-    ep_cursortrace@3.1.15 \
+    ep_cursortrace@3.1.16 \
     git+https://github.com/mconf/ep_pad_ttl.git#360136cd38493dd698435631f2373cbb7089082d \
-    git+https://github.com/mconf/ep_redis_publisher.git#1d903bf900dd53ebc5347f9583b6e240cf754d63 \
-    ep_disable_chat@0.0.7 \
+    git+https://github.com/mconf/ep_redis_publisher.git#a30a48e4bc1e501b5b102884b9a0b26c30798484 \
+    ep_disable_chat@0.0.8 \
+    ep_auth_session@1.1.1 \
 # remove npm lockfile, because somehow it prevents etherpad from detecting the manual added plugin ep_bigbluebutton_patches
     && rm package-lock.json
 
diff --git a/mod/html5/bbb-html5.yml b/mod/html5/bbb-html5.yml
index fb0e554..baf6de8 100644
--- a/mod/html5/bbb-html5.yml
+++ b/mod/html5/bbb-html5.yml
@@ -1,6 +1,6 @@
 public:
   app:
-    bbbServerVersion: v2.5.0-beta.2-docker
+    bbbServerVersion: {{ .Env.TAG_HTML5 }}-docker
     listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }}
     skipCheck: {{ .Env.DISABLE_ECHO_TEST }}
     clientTitle: {{ .Env.CLIENT_TITLE }}
diff --git a/tags.env b/tags.env
index d094962..0dea0f4 100644
--- a/tags.env
+++ b/tags.env
@@ -7,12 +7,12 @@
 BBB_BUILD_TAG=v2022-03-30
 
 # https://github.com/bigbluebutton/bigbluebutton
-TAG_COMMON_MESSAGE=v2.5.0-rc.1
-TAG_APPS_AKKA=v2.5.0-rc.1
-TAG_FSESL_AKKA=v2.5.0-rc.1
-TAG_BBB_WEB=v2.5.0-rc.1
-TAG_HTML5=v2.5.0-rc.1
-TAG_RECORDINGS=v2.5.0-rc.1
+TAG_COMMON_MESSAGE=v2.5.0-rc.4
+TAG_APPS_AKKA=v2.5.0-rc.4
+TAG_FSESL_AKKA=v2.5.0-rc.4
+TAG_BBB_WEB=v2.5.0-rc.4
+TAG_HTML5=v2.5.0-rc.4
+TAG_RECORDINGS=v2.5.0-rc.4
 
 TAG_LEARNING_DASHBOARD=v2.5.0-rc.1
 TAG_FS_CONFIG=v2.5.0-rc.1
@@ -24,4 +24,4 @@ TAG_FS_CONFIG=v2.5.0-rc.1
 TAG_WEBRTC_SFU=v2.8.1
 TAG_WEBHOOKS=v2.5.0
 TAG_PLAYBACK=v4.0.0
-TAG_PADS=v1.1.0
\ No newline at end of file
+TAG_PADS=v1.2.1
\ No newline at end of file