diff --git a/.github/workflows/dev-13.yml b/.github/workflows/dev-13.yml
index 3f6181c..f54357d 100644
--- a/.github/workflows/dev-13.yml
+++ b/.github/workflows/dev-13.yml
@@ -54,8 +54,6 @@ jobs:
           push: ${{ startsWith(github.ref, 'refs/heads/') }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
-            bfren/postgresql:dev
-            bfren/postgresql:${{ steps.version.outputs.contents }}-beta
             bfren/postgresql:postgresql13-dev
             bfren/postgresql:postgresql13-${{ steps.version.outputs.contents }}-beta
       -
diff --git a/.github/workflows/publish-13.yml b/.github/workflows/publish-13.yml
index 247ff31..2ba77a0 100644
--- a/.github/workflows/publish-13.yml
+++ b/.github/workflows/publish-13.yml
@@ -71,10 +71,6 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
-            bfren/postgresql:latest
-            bfren/postgresql:${{ steps.version_major.outputs.contents }}
-            bfren/postgresql:${{ steps.version_minor.outputs.contents }}
-            bfren/postgresql:${{ steps.version.outputs.contents }}
             bfren/postgresql:postgresql13
             bfren/postgresql:postgresql13-${{ steps.version_major.outputs.contents }}
             bfren/postgresql:postgresql13-${{ steps.version_minor.outputs.contents }}
diff --git a/12/Dockerfile b/12/Dockerfile
index 1425cc3..307a3d1 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-4.0.5
+FROM bfren/alpine-s6:alpine3.15-4.0.6
 
 ARG BF_IMAGE
 ARG BF_VERSION
diff --git a/13/Dockerfile b/13/Dockerfile
index 93efa37..295e5f4 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-4.0.5
+FROM bfren/alpine-s6:alpine3.15-4.0.6
 
 ARG BF_IMAGE
 ARG BF_VERSION
diff --git a/14/Dockerfile b/14/Dockerfile
index 81cd90c..8b7e69e 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-4.0.5
+FROM bfren/alpine-s6:alpine3.15-4.0.6
 
 ARG BF_IMAGE
 ARG BF_VERSION
diff --git a/VERSION b/VERSION
index 26e3379..b9d2bdf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.4
\ No newline at end of file
+2.0.5
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index 213d1c6..05801b5 100644
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="4.0.5"
+BASE_REVISION="4.0.6"
 echo "Base: ${BASE_REVISION}"
 
 POSTGRESQL_VERSIONS="12 13 14"