diff --git a/docker/nginx/entrypoint.sh b/docker/nginx/entrypoint.sh
index dd9f7c7..9f4881f 100644
--- a/docker/nginx/entrypoint.sh
+++ b/docker/nginx/entrypoint.sh
@@ -36,10 +36,28 @@ build_cert_bundle() {
     exit 1
   fi
 
-  cat "${cert_path}" "${chain_path}" > "${GENERATED_CERT_PATH}"
+  normalize_pem_file "${cert_path}" > "${GENERATED_CERT_PATH}"
+  normalize_pem_file "${chain_path}" >> "${GENERATED_CERT_PATH}"
   cp "${key_path}" "${GENERATED_KEY_PATH}"
 }
 
+normalize_pem_file() {
+  pem_path="$1"
+
+  awk '
+    {
+      sub(/\r$/, "")
+      print
+      has_content = 1
+    }
+    END {
+      if (has_content) {
+        print ""
+      }
+    }
+  ' "${pem_path}"
+}
+
 write_nginx_config() {
   cat > /etc/nginx/conf.d/default.conf <<EOF
 server {