diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 90e01b67af5d75..1286530815f94d 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -106,7 +106,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build & Deploy ${{ matrix.dockerfile[0] }}
-        uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # @v2
+        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # @v2
         with:
           context: dockerfiles/${{ matrix.dockerfile[0] }}
           platforms: ${{ matrix.dockerfile[1] }}
diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py
index c1de5eb2c32b91..559329e45fa866 100644
--- a/var/spack/repos/builtin/packages/py-platformdirs/package.py
+++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py
@@ -13,8 +13,22 @@ class PyPlatformdirs(PythonPackage):
     homepage = "https://github.com/platformdirs/platformdirs"
     pypi = "platformdirs/platformdirs-2.4.0.tar.gz"
 
+    version("2.4.1", sha256="440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda")
     version("2.4.0", sha256="367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2")
+    version("2.3.0", sha256="15b056538719b1c94bdaccb29e5f81879c7f7f0f4a153f46086d155dffcd4f0f")
 
+    depends_on("python@3.7:", when="@2.4.1:", type=("build", "run"))
     depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools@44:", type="build")
     depends_on("py-setuptools-scm@5:+toml", type="build")
+
+    @when("^python@:3.6")
+    @run_before("install")
+    def handle_utf8_setup_cfg(self):
+        """Sanitize setup.cfg to resolve issues with Python 3.6 and UTF-8"""
+        with open("setup.cfg", mode="r", encoding="utf-8") as input_file:
+            cfg = input_file.readlines()
+        with open(
+            "setup.cfg", mode="w", encoding="ascii", errors="backslashreplace"
+        ) as output_file:
+            output_file.writelines(cfg)