diff --git a/.travis.yml b/.travis.yml
index f60276f..e519516 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,10 @@ services:
 env:
   global:
     - MAIN_BRANCH=v9.2.0.x-eus
-    - MQ_LTS_VERSION=9.2.0.2
+    - MQ_LTS_VERSION=9.2.0.4
     - TAGCACHE_FILE=tagcache
     - RELEASE=r2
-    - RELEASE_LTS=r2
+    - RELEASE_LTS=r1
 
 go_import_path: "github.com/ibm-messaging/mq-container"
 
@@ -109,7 +109,7 @@ jobs:
         - LTS=true
         - TAGCACHE_FILE=tagcache-lts
         - MQ_VERSION=$MQ_LTS_VERSION
-        - MQ_ARCHIVE_REPOSITORY=$MQ_9202_EUS_ARCHIVE_REPOSITORY_AMD64
+        - MQ_ARCHIVE_REPOSITORY=$MQ_9204_EUS_ARCHIVE_REPOSITORY_AMD64
         - RELEASE=$RELEASE_LTS
       script: bash -e travis-build-scripts/run.sh
     - stage: build
@@ -121,7 +121,7 @@ jobs:
         - TAGCACHE_FILE=tagcache-lts
         - MQ_VERSION=$MQ_LTS_VERSION
         - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-        - MQ_ARCHIVE_REPOSITORY=$MQ_9202_EUS_ARCHIVE_REPOSITORY_S390X
+        - MQ_ARCHIVE_REPOSITORY=$MQ_9204_EUS_ARCHIVE_REPOSITORY_S390X
         - RELEASE=$RELEASE_LTS
       script: bash -e travis-build-scripts/run.sh
     - stage: push-manifest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47dee2a..f1349cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Change log
 
+## 9.2.0.4-LTS (2021-10-05)
+
+* Updated to MQ version 9.2.0.4
+
 ## 9.2.0.1-LTS (2020-12-04)
 
 * Added support for MQ Long Term Support (production licensed only) in the mq-container
-  
+
 ## 9.2.0.0 (2020-07-23)
 
 * Updated to [MQ version 9.2.0.0](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.2.0/com.ibm.mq.pro.doc/q113110_.htm)
@@ -19,7 +23,7 @@
 * Updated to MQ version 9.1.4.0
 * Updated to use UBI8 as base image
 * Added required security settings to self signed certificates to align with macOS Catalina requirements
-  
+
 ## 9.1.3.0 (2019-07-19)
 
 * Updated to MQ version 9.1.3.0
@@ -40,7 +44,7 @@
 * Security fixes
 * Web console added to production image
 * Container built on RedHat host
-  
+
 ## 9.1.2.0 (2019-03-21)
 
 * Updated to MQ version 9.1.2.0
diff --git a/Dockerfile-server b/Dockerfile-server
index 7e86551..483e579 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -13,13 +13,15 @@
 # limitations under the License.
 
 ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
-ARG BASE_TAG=8.4-205
+ARG BASE_TAG=8.4-210
+ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset
+ARG BUILDER_TAG=1.15.14-10
 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
-ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.0.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
+ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.0.4-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
 ###############################################################################
 # Build stage to build Go code
 ###############################################################################
-FROM registry.redhat.io/ubi8/go-toolset:1.15.13-4 as builder
+FROM $BUILDER_IMAGE:$BUILDER_TAG as builder
 # The URL to download the MQ installer from in tar.gz format
 # This assumes an archive containing the MQ Non-Install packages
 ARG MQ_URL
diff --git a/docs/security.md b/docs/security.md
index 779efdf..93ed2d7 100644
--- a/docs/security.md
+++ b/docs/security.md
@@ -16,7 +16,7 @@ docker run \
   --env LICENSE=accept \
   --env MQ_QMGR_NAME=QM1 \
   --detach \
-  ibm-mqadvanced-server:9.2.0.0-amd64
+  ibm-mqadvanced-server:9.2.0.4-amd64
 ```
 
 The MQ Advanced for Developers image does require the "chown", "setuid", "setgid" and "audit_write" capabilities (plus "dac_override" if you're using an image based on Red Hat Enterprise Linux).  This is because it uses the "sudo" command to change passwords inside the container.  For example, in Docker, you could do the following:
@@ -31,5 +31,5 @@ docker run \
   --env LICENSE=accept \
   --env MQ_QMGR_NAME=QM1 \
   --detach \
-  ibm-mqadvanced-server-dev:9.2.0.0-amd64
+  ibm-mqadvanced-server-dev:9.2.0.4-amd64
 ```
diff --git a/docs/testing.md b/docs/testing.md
index 55ded8a..f352b59 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -25,7 +25,7 @@ make advancedserver
 You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example:
 
 ```
-MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.0.0-amd64 make test-advancedserver
+MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.0.4-amd64 make test-advancedserver
 ```
 
 You can pass parameters to `go test` with an environment variable.  For example, to run the "TestGoldenPath" test, run the following command: