diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index c934cc1..3e8c60b 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -25,7 +25,7 @@ jobs:
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.15.6"
+        uses: "pascalgn/automerge-action@v0.16.2"
         env:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           MERGE_METHOD: "squash"
diff --git a/templates/docker-monolithic/docker-compose.yml b/templates/docker-monolithic/docker-compose.yml
index f41ea34..e0e1751 100644
--- a/templates/docker-monolithic/docker-compose.yml
+++ b/templates/docker-monolithic/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     container_name: supportpal
     image: 'public.ecr.aws/supportpal/helpdesk-monolithic:5.1.2'
     restart: always
+    stop_grace_period: 60s
     ports:
       - '80:80'
     env_file:
diff --git a/templates/linux/setup.sh b/templates/linux/setup.sh
index e5dccec..ba0dc41 100644
--- a/templates/linux/setup.sh
+++ b/templates/linux/setup.sh
@@ -482,7 +482,7 @@ install_mysql() {
     debconf-set-selections <<< "mysql-server mysql-server/root_password password ${root_password}"
     debconf-set-selections <<< "mysql-server mysql-server/root_password_again password ${root_password}"
 
-    wget -O mysql-apt-config.deb https://dev.mysql.com/get/mysql-apt-config_0.8.26-1_all.deb
+    wget -O mysql-apt-config.deb https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb
     dpkg -i mysql-apt-config.deb && apt-get update
     rm mysql-apt-config.deb
   fi