diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index a986d3a3..95422d3b 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -44,8 +44,8 @@
 # 	https://docs.docker.com/develop/develop-images/multistage-build/
 # 	https://whitfin.io/speeding-up-rust-docker-builds/
 ####################### VAULT BUILD IMAGE  #######################
-{% set vault_version = "2.17.1" %}
-{% set vault_image_digest = "sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0" %}
+{% set vault_version = "2.18.0" %}
+{% set vault_image_digest = "sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c" %}
 # The web-vault digest specifies a particular web-vault build on Docker Hub.
 # Using the digest instead of the tag name provides better security,
 # as the digest of an image is immutable, whereas a tag name can later
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
index 4f6ab20d..1f73de32 100644
--- a/docker/amd64/Dockerfile
+++ b/docker/amd64/Dockerfile
@@ -14,15 +14,15 @@
 # - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull bitwardenrs/web-vault:v2.17.1
-#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.17.1
-#     [bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0]
+#     $ docker pull bitwardenrs/web-vault:v2.18.0
+#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.0
+#     [bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0
-#     [bitwardenrs/web-vault:v2.17.1]
+#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c
+#     [bitwardenrs/web-vault:v2.18.0]
 #
-FROM bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0 as vault
+FROM bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM rust:1.48 as build
diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine
index 4576afc8..277b0489 100644
--- a/docker/amd64/Dockerfile.alpine
+++ b/docker/amd64/Dockerfile.alpine
@@ -14,15 +14,15 @@
 # - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull bitwardenrs/web-vault:v2.17.1
-#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.17.1
-#     [bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0]
+#     $ docker pull bitwardenrs/web-vault:v2.18.0
+#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.0
+#     [bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0
-#     [bitwardenrs/web-vault:v2.17.1]
+#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c
+#     [bitwardenrs/web-vault:v2.18.0]
 #
-FROM bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0 as vault
+FROM bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM clux/muslrust:nightly-2020-11-22 as build
diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile
index fd7bedaf..f15052d5 100644
--- a/docker/arm64/Dockerfile
+++ b/docker/arm64/Dockerfile
@@ -14,15 +14,15 @@
 # - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull bitwardenrs/web-vault:v2.17.1
-#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.17.1
-#     [bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0]
+#     $ docker pull bitwardenrs/web-vault:v2.18.0
+#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.0
+#     [bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0
-#     [bitwardenrs/web-vault:v2.17.1]
+#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c
+#     [bitwardenrs/web-vault:v2.18.0]
 #
-FROM bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0 as vault
+FROM bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM rust:1.48 as build
diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile
index d4361872..7c8e2934 100644
--- a/docker/armv6/Dockerfile
+++ b/docker/armv6/Dockerfile
@@ -14,15 +14,15 @@
 # - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull bitwardenrs/web-vault:v2.17.1
-#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.17.1
-#     [bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0]
+#     $ docker pull bitwardenrs/web-vault:v2.18.0
+#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.0
+#     [bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0
-#     [bitwardenrs/web-vault:v2.17.1]
+#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c
+#     [bitwardenrs/web-vault:v2.18.0]
 #
-FROM bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0 as vault
+FROM bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM rust:1.48 as build
diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile
index 5bd945d9..73f13e92 100644
--- a/docker/armv7/Dockerfile
+++ b/docker/armv7/Dockerfile
@@ -14,15 +14,15 @@
 # - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull bitwardenrs/web-vault:v2.17.1
-#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.17.1
-#     [bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0]
+#     $ docker pull bitwardenrs/web-vault:v2.18.0
+#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.0
+#     [bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0
-#     [bitwardenrs/web-vault:v2.17.1]
+#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c
+#     [bitwardenrs/web-vault:v2.18.0]
 #
-FROM bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0 as vault
+FROM bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM rust:1.48 as build
diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine
index 00cba645..d4c8669e 100644
--- a/docker/armv7/Dockerfile.alpine
+++ b/docker/armv7/Dockerfile.alpine
@@ -14,15 +14,15 @@
 # - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull bitwardenrs/web-vault:v2.17.1
-#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.17.1
-#     [bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0]
+#     $ docker pull bitwardenrs/web-vault:v2.18.0
+#     $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.0
+#     [bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0
-#     [bitwardenrs/web-vault:v2.17.1]
+#     $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c
+#     [bitwardenrs/web-vault:v2.18.0]
 #
-FROM bitwardenrs/web-vault@sha256:dcb7884dc5845b3842ff2204fe77482000b771495c6c359297ec3c03330d65e0 as vault
+FROM bitwardenrs/web-vault@sha256:b4454a3525ee6928ea85074f5e126858954c08b8cd7794150393ba83a6dd502c as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM messense/rust-musl-cross:armv7-musleabihf as build