diff --git a/.dockerignore b/.dockerignore
index a92dc8c39..716a19c82 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,5 +3,7 @@
 !common.mk
 !requirements*.txt
 !bin/keys/docker-apt-keyring.pgp
+# FIXME: Remove fips_enabled
+#        https://github.com/DataBiosphere/azul/issues/6675
 !fips_enabled
 requirements.all.txt
diff --git a/.gitignore b/.gitignore
index 4c6524d71..40a8a7d64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ __pycache__/
 /.coverage
 /.coverage.*
 /fedramp_inventory.xlsx
+# FIXME: Remove fips_enabled
+#        https://github.com/DataBiosphere/azul/issues/6675
 /fips_enabled
 
 ## Build products above this line. Please see the `clean` target in Makefile.
diff --git a/Dockerfile b/Dockerfile
index 09e14acb5..4edfeda8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,6 +46,8 @@ RUN mkdir terraform \
 RUN install -m 0755 -d /etc/apt/keyrings
 COPY --chmod=0644 bin/keys/docker-apt-keyring.pgp /etc/apt/keyrings/docker.gpg
 ARG azul_docker_version
+# FIXME: Remove mounting of fips_enabled
+#        https://github.com/DataBiosphere/azul/issues/6675
 ARG azul_proc_sys_crypto
 RUN --mount=type=bind,source=fips_enabled,target=${azul_proc_sys_crypto}/fips_enabled \
     set -o pipefail \
diff --git a/Makefile b/Makefile
index 2da01ebbe..df9d622a9 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,8 @@ $(eval $(call requirements,_runtime_deps,requirements_pip,,))
 define docker
 .PHONY: docker$1
 docker$1: check_docker
+	# FIXME: Remove creation of fips_enabled
+	#        https://github.com/DataBiosphere/azul/issues/6675
 	echo 0 > fips_enabled
 	docker build \
 	       --build-arg azul_docker_registry=$$(azul_docker_registry) \
diff --git a/environment.py b/environment.py
index 572db6d73..16614cd05 100644
--- a/environment.py
+++ b/environment.py
@@ -270,6 +270,9 @@ def env() -> Mapping[str, Optional[str]]:
         # command `apt-get update` to succeed which would otherwise fail on
         # Debian bookworm with FIPS mode enabled.
         #
+        # FIXME: Remove azul_proc_sys_crypto
+        #        https://github.com/DataBiosphere/azul/issues/6675
+        #
         'azul_proc_sys_crypto': '/tmp',
 
         # A dictionary mapping the short name of each Docker image used in Azul