diff --git a/.github/workflows/build_and_push_docker_images.yml b/.github/workflows/build_and_push_docker_images.yml
index 5d6a3af..752c8a3 100644
--- a/.github/workflows/build_and_push_docker_images.yml
+++ b/.github/workflows/build_and_push_docker_images.yml
@@ -6,10 +6,10 @@ on:
   release:
     types: [published]
 env:
-  MOSQUITTO_VERSION_1: 1.6.14
-  MOSQUITTO_VERSION_2: 2.0.15
+  MOSQUITTO_VERSION_1: 1.6.15
+  MOSQUITTO_VERSION_2: 2.0.18
   MOSQUITTO_VERSION_SUFFIX: -mosquitto_
-  DOCKERFILE_MOSQUITTO_VERSION: 1.6.14
+  DOCKERFILE_MOSQUITTO_VERSION: 2.0.18
   DOCKERHUB_REPO: mosquitto-go-auth
 jobs:
   mosq_1:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5e19f2c..e85bded 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,8 +6,8 @@ on:
   pull_request:
     branches: [ master ]
 env:
-  MOSQUITTO_VERSION_1: 1.6.14
-  MOSQUITTO_VERSION_2: 2.0.15
+  MOSQUITTO_VERSION_1: 1.6.15
+  MOSQUITTO_VERSION_2: 2.0.18
   DOCKERFILE_MOSQUITTO_VERSION: 1.6.14
   DOCKERHUB_REPO: mosquitto-go-auth
 jobs:
diff --git a/Dockerfile b/Dockerfile
index 6c269cd..0184bc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Define Mosquitto version, see also .github/workflows/build_and_push_docker_images.yml for
 # the automatically built images
-ARG MOSQUITTO_VERSION=2.0.15
+ARG MOSQUITTO_VERSION=2.0.18
 # Define libwebsocket version
 ARG LWS_VERSION=4.2.2