diff --git a/Dockerfile-server b/Dockerfile-server
index 4d0898e..f433b3a 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -99,7 +99,7 @@ RUN chmod ug+x /usr/local/bin/runmqserver \
   && chmod 0660 /run/termination-log
 # Always use port 1414 for MQ & 9157 for the metrics
 EXPOSE 1414 9157 9443
-ENV QMGRACEPERIOD=30
+ENV MQ_GRACE_PERIOD=30
 ENV LANG=en_US.UTF-8 AMQ_DIAGNOSTIC_MSG_SEVERITY=1 AMQ_ADDITIONAL_JSON_LOG=1 LOG_FORMAT=basic
 USER $MQM_UID
 ENTRYPOINT ["runmqserver"]
diff --git a/cmd/runmqserver/qmgr.go b/cmd/runmqserver/qmgr.go
index ad4d1e3..549e259 100644
--- a/cmd/runmqserver/qmgr.go
+++ b/cmd/runmqserver/qmgr.go
@@ -173,7 +173,7 @@ func configureQueueManager() error {
 
 func stopQueueManager(name string) error {
 	log.Println("Stopping queue manager")
-	qmGracePeriod := os.Getenv("QMGRACEPERIOD")
+	qmGracePeriod := os.Getenv("MQ_GRACE_PERIOD")
 	isStandby, err := ready.IsRunningAsStandbyQM(name)
 	if err != nil {
 		log.Printf("Error getting status for queue manager %v: %v", name, err.Error())
diff --git a/test/docker/docker_api_test.go b/test/docker/docker_api_test.go
index 2c2d976..4863c52 100644
--- a/test/docker/docker_api_test.go
+++ b/test/docker/docker_api_test.go
@@ -84,7 +84,7 @@ func TestEndMQMOpts(t *testing.T) {
 		t.Fatal(err)
 	}
 	containerConfig := container.Config{
-		Env: []string{"LICENSE=accept", "QMGRACEPERIOD=27"},
+		Env: []string{"LICENSE=accept", "MQ_GRACE_PERIOD=27"},
 	}
 
 	id := runContainer(t, cli, &containerConfig)