diff --git a/docker/README b/docker/README
index beb70299e..9e7573342 100644
--- a/docker/README
+++ b/docker/README
@@ -15,19 +15,19 @@ Examples:
   cd from-packages
   docker build --no-cache -t mydomain/code -f Ubuntu .
 
-2. Build Collabora Online 21.11 based on Ubuntu 18.04 LTS
+2. Build Collabora Online 22.05 based on Ubuntu 18.04 LTS
 
   cd from-packages
   # Get your secret URL key from https://support.collaboraoffice.com/ (Collabora Partners/Customers)
   docker build --no-cache --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f Ubuntu .
 
-3. Build Collabora Online 21.11 based on RHEL8
+3. Build Collabora Online 22.05 based on RHEL8
 
   cd from-packages
   # Get your secret URL key from https://support.collaboraoffice.com/ (Collabora Partners/Customers)
   docker build --no-cache --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f RHEL8 .
 
-4. Build Collabora Online 21.11 license key enabled version based on Ubuntu 18.04 LTS
+4. Build Collabora Online 22.05 license key enabled version based on Ubuntu 18.04 LTS
 
    cd from-packages
    docker build --no-cache --build-arg type=key -t mydomain/cool -f Ubuntu .
diff --git a/docker/from-packages/RHEL8 b/docker/from-packages/RHEL8
index f8ceaf89f..60450ad75 100644
--- a/docker/from-packages/RHEL8
+++ b/docker/from-packages/RHEL8
@@ -8,8 +8,8 @@ FROM registry.access.redhat.com/ubi8/ubi:8.1
 # Optional. The default is 'repos'.
 ARG repo
 
-# version: can be '21.11'
-# Optional. The default is '21.11'.
+# version: can be '22.05' and '21.11'
+# Optional. The default is '22.05'.
 ARG version
 
 # type: can be
diff --git a/docker/from-packages/Ubuntu b/docker/from-packages/Ubuntu
index f28fc31b1..20137da91 100644
--- a/docker/from-packages/Ubuntu
+++ b/docker/from-packages/Ubuntu
@@ -8,8 +8,8 @@ FROM ubuntu:18.04
 # Optional. The default is 'repos'.
 ARG repo
 
-# version: can be '21.11'
-# Optional. The default is '21.11'.
+# version: can be '22.05' and '21.11'
+# Optional. The default is '22.05'.
 ARG version
 
 # type: can be
diff --git a/docker/from-packages/scripts/install-collabora-online-rhel8.sh b/docker/from-packages/scripts/install-collabora-online-rhel8.sh
index e5b45a404..8c402138a 100755
--- a/docker/from-packages/scripts/install-collabora-online-rhel8.sh
+++ b/docker/from-packages/scripts/install-collabora-online-rhel8.sh
@@ -27,7 +27,7 @@ wget https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/CODE-centos8/rep
 
 if [ "$type" == "cool" ] && [ -n ${secret_key+set} ]; then
     echo "Based on the provided build arguments Collabora Online from customer repo will be used."
-    dnf config-manager --add-repo https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-21.11}/customer-centos8-${secret_key}
+    dnf config-manager --add-repo https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-centos8-${secret_key}
 elif [ "$type" == "key" ]; then
     echo "Based on the provided build arguments license key enabled Collabora Online was selected, but it's available only on Ubuntu. Collabora Online Development Edition will be used."
     type="code"
diff --git a/docker/from-packages/scripts/install-collabora-online-ubuntu.sh b/docker/from-packages/scripts/install-collabora-online-ubuntu.sh
index b66332553..c4ff9c882 100755
--- a/docker/from-packages/scripts/install-collabora-online-ubuntu.sh
+++ b/docker/from-packages/scripts/install-collabora-online-ubuntu.sh
@@ -35,10 +35,10 @@ fi
 # Add Collabora repos
 if [ "$type" == "cool" ] && [ -n ${secret_key+set} ]; then
     echo "Based on the provided build arguments Collabora Online from customer repo will be used."
-    echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-21.11}/customer-ubuntu1804-${secret_key} /" >> /etc/apt/sources.list.d/collabora.list
+    echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-ubuntu1804-${secret_key} /" >> /etc/apt/sources.list.d/collabora.list
 elif [ "$type" == "key" ]; then
     echo "Based on the provided build arguments license key enabled Collabora Online will be used."
-    echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-21.11}-key /" >> /etc/apt/sources.list.d/collabora.list
+    echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}-key /" >> /etc/apt/sources.list.d/collabora.list
 else
     echo "Based on the provided build arguments Collabora Online Development Edition will be used."
     if [ $(uname -i) == "aarch64" ]; then