diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7cfc34d..f230b3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        pgbackrest_version: ["2.54.2", "2.55.0", "2.55.1", "2.56.0", "2.57.0"]
+        pgbackrest_version: ["2.55.0", "2.55.1", "2.56.0", "2.57.0", "2.58.0"]
     env: 
-      latest_version: "2.57.0"
+      latest_version: "2.58.0"
       download_url: "https://github.com/pgbackrest/pgbackrest/archive/release"
     steps:
     - uses: actions/checkout@v4
@@ -160,7 +160,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        pgbackrest_version: ["2.52_arenadata12", "2.54_arenadata13"]
+        pgbackrest_version: ["2.52_arenadata12", "2.54_arenadata14"]
     env: 
       download_url: "https://github.com/arenadata/pgbackrest/archive"
     steps:
diff --git a/Makefile b/Makefile
index bda847c..1580e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-BACKREST_VERSIONS = 2.54.2 2.55.0 2.55.1 2.56.0 2.57.0
-TAG?=2.57.0
+BACKREST_VERSIONS = 2.55.0 2.55.1 2.56.0 2.57.0 2.58.0
+TAG?=2.58.0
 TAG_MESON_BUILD=2.51
 BACKREST_DOWNLOAD_URL = https://github.com/pgbackrest/pgbackrest/archive/release
-BACKREST_GPDB_VERSIONS = 2.52_arenadata12 2.54_arenadata13
-TAG_GPDB?=2.54_arenadata13
+BACKREST_GPDB_VERSIONS = 2.52_arenadata12 2.54_arenadata14
+TAG_GPDB?=2.54_arenadata14
 BACKREST_GPDB_DOWNLOAD_URL = https://github.com/arenadata/pgbackrest/archive
 BACKREST_COMP_VERSION?=v0.11
 BACKREST_OLD_COMP_VERSION?=v0.10
diff --git a/README.md b/README.md
index 22a6cf7..8b1848f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,9 @@ The repository contains information for the last 5 releases of pgBackRest. If ne
 
 Supported pgBackRest version tags:
 
-* `2.57.0`, `latest`
+* `2.58.0`, `latest`
+* `2.58.0-alpine`
+* `2.57.0`
 * `2.57.0-alpine`
 * `2.56.0`
 * `2.56.0-alpine`
@@ -16,8 +18,6 @@ Supported pgBackRest version tags:
 * `2.55.1-alpine`
 * `2.55.0`
 * `2.55.0-alpine`
-* `2.54.2`
-* `2.54.2-alpine`
 
 The repository also contains information for releases of pgBackRest fork with Greenplum support (see [pgbackrest/pull/1833](https://github.com/pgbackrest/pgbackrest/pull/1833)). Details - [build with Greenplum support](#build-with-greenplum-support).
 
@@ -81,10 +81,10 @@ docker run --rm  pgbackrest:51 pgbackrest help
 ### Injecting inside
 
 ```bash
-docker run --rm -it pgbackrest:2.57.0 bash
+docker run --rm -it pgbackrest:2.58.0 bash
 
 pgbackrest@cac1f58b56f2:/$ pgbackrest version
-pgBackRest 2.57.0
+pgBackRest 2.58.0
 ```
 
 ### Example for Dedicated Repository Host
@@ -100,7 +100,7 @@ docker run --rm \
     -v ~/.ssh/id_rsa:/home/pgbackrest/.ssh/id_rsa \
     -v /etc/pgbackrest:/etc/pgbackrest \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
-    pgbackrest:2.57.0 \
+    pgbackrest:2.58.0 \
     pgbackrest backup --stanza demo --type full --log-level-console info
 ```
 
@@ -127,7 +127,7 @@ docker run --rm \
     -v /etc/pgbackrest:/etc/pgbackrest \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
     -v /tmp/pgbackrest:/tmp/pgbackrest \
-    pgbackrest:2.57.0 \
+    pgbackrest:2.58.0 \
     pgbackrest backup --stanza demo --type full --log-level-console info
 ```
 
@@ -163,7 +163,7 @@ docker run -d \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
     -p 8432:8432 \
     --name backrest_server \
-    pgbackrest:2.57.0
+    pgbackrest:2.58.0
 ```
 
 ##### Run container with TLS server in background for pgBackRest execution over TLS
@@ -175,7 +175,7 @@ docker run --rm \
     -e BACKREST_HOST_TYPE=tls \
     -v /etc/pgbackrest:/etc/pgbackrest \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
-    pgbackrest:2.57.0 \
+    pgbackrest:2.58.0 \
     pgbackrest backup --stanza demo --type full --log-level-console info
 ```
 
@@ -194,7 +194,7 @@ docker run --rm \
     -v /var/lib/postgresql/12/main:/var/lib/postgresql/12/main \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
     -v /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432 \
-    pgbackrest:2.57.0 \
+    pgbackrest:2.58.0 \
     pgbackrest backup --stanza demo --type full --log-level-console info
 ```
 
@@ -214,7 +214,7 @@ docker run -d \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
     -p 8432:8432 \
     --name backrest_server \
-    pgbackrest:2.57.0
+    pgbackrest:2.58.0
 ```
 
 Performing a backup:
@@ -227,28 +227,28 @@ docker run --rm \
     -v /etc/pgbackrest/pgbackrest.conf:/etc/pgbackrest/pgbackrest.conf \
     -v /etc/pgbackrest/cert:/etc/pgbackrest/cert \
     -v /var/lib/pgbackrest:/var/lib/pgbackrest \
-    pgbackrest:2.57.0 \
+    pgbackrest:2.58.0 \
     pgbackrest backup --stanza demo --type full --log-level-console info
 ```
 
 ## Build
 
 ```bash
-make build_version TAG=2.57.0
+make build_version TAG=2.58.0
 ```
 
 ```bash
-make build_version_alpine TAG=2.57.0
+make build_version_alpine TAG=2.58.0
 ```
 
 or
 
 ```bash
-docker build -f Dockerfile --build-arg BACKREST_VERSION=2.57.0 --build-arg BACKREST_COMPLETION_VERSION=v0.10 -t pgbackrest:2.57.0 .
+docker build -f Dockerfile --build-arg BACKREST_VERSION=2.58.0 --build-arg BACKREST_COMPLETION_VERSION=v0.11 -t pgbackrest:2.58.0 .
 ```
 
 ```bash
-docker build -f Dockerfile.alpine --build-arg BACKREST_VERSION=2.57.0 --build-arg BACKREST_COMPLETION_VERSION=v0.10 -t pgbackrest:2.57.0-alpine .
+docker build -f Dockerfile.alpine --build-arg BACKREST_VERSION=2.58.0 --build-arg BACKREST_COMPLETION_VERSION=v0.11 -t pgbackrest:2.58.0-alpine .
 ```
 
 ### Build pgBackRest < `v2.51`
diff --git a/e2e_tests/.env b/e2e_tests/.env
index 3442608..7c60fbd 100644
--- a/e2e_tests/.env
+++ b/e2e_tests/.env
@@ -1,4 +1,4 @@
-TAG=2.57.0
+TAG=2.58.0
 PG_VERSION=16
 IMAGE_TAG_MINIO=RELEASE.2025-04-22T22-12-26Z
 IMAGE_TAG_MINIO_MC=RELEASE.2025-04-16T18-13-26Z
diff --git a/e2e_tests/conf/pg/Dockerfile b/e2e_tests/conf/pg/Dockerfile
index 3827c02..5214bc9 100644
--- a/e2e_tests/conf/pg/Dockerfile
+++ b/e2e_tests/conf/pg/Dockerfile
@@ -1,4 +1,4 @@
-ARG BACKREST_VERSION="2.57.0"
+ARG BACKREST_VERSION="2.58.0"
 ARG CONTAINER_TYPE="ssh"
 ARG PG_VERSION="16"
 
diff --git a/e2e_tests/conf/sftp/Dockerfile b/e2e_tests/conf/sftp/Dockerfile
index db5708a..7764d59 100644
--- a/e2e_tests/conf/sftp/Dockerfile
+++ b/e2e_tests/conf/sftp/Dockerfile
@@ -1,4 +1,4 @@
-ARG BACKREST_VERSION="2.57.0"
+ARG BACKREST_VERSION="2.58.0"
 
 FROM pgbackrest:${BACKREST_VERSION}
 ARG CONTAINER_TYPE="rsa"