diff --git a/src/components/Solutions/SolutionDetail/SolutionDetail.js b/src/components/Solutions/SolutionDetail/SolutionDetail.js
index b87f06c7c..51489b6d1 100644
--- a/src/components/Solutions/SolutionDetail/SolutionDetail.js
+++ b/src/components/Solutions/SolutionDetail/SolutionDetail.js
@@ -239,6 +239,7 @@ class SolutionDetail extends Component {
           <Col xl={6}>
             <SolutionFiles
               solutionId={id}
+              attemptIndex={attemptIndex}
               files={files}
               authorId={authorId}
               openFile={this.openFile}
diff --git a/src/components/Solutions/SolutionFiles/SolutionFiles.js b/src/components/Solutions/SolutionFiles/SolutionFiles.js
index 5cfd2cccd..e147df019 100644
--- a/src/components/Solutions/SolutionFiles/SolutionFiles.js
+++ b/src/components/Solutions/SolutionFiles/SolutionFiles.js
@@ -34,6 +34,7 @@ const preprocessFiles = defaultMemoize(files =>
 
 const SolutionFiles = ({
   solutionId,
+  attemptIndex,
   files,
   authorId,
   isReference = false,
@@ -181,6 +182,7 @@ const SolutionFiles = ({
                       <td className="text-nowrap shrink-col text-right">
                         <DownloadSolutionArchiveContainer
                           solutionId={solutionId}
+                          attemptIndex={attemptIndex}
                           authorId={authorId}
                           isReference={isReference}
                           size="xs"
@@ -199,6 +201,7 @@ const SolutionFiles = ({
   );
 SolutionFiles.propTypes = {
   solutionId: PropTypes.string.isRequired,
+  attemptIndex: PropTypes.number,
   files: ImmutablePropTypes.map,
   authorId: PropTypes.string.isRequired,
   isReference: PropTypes.bool,
diff --git a/src/containers/DownloadSolutionArchiveContainer/DownloadSolutionArchiveContainer.js b/src/containers/DownloadSolutionArchiveContainer/DownloadSolutionArchiveContainer.js
index c09ccfc0e..f5a52e0cf 100644
--- a/src/containers/DownloadSolutionArchiveContainer/DownloadSolutionArchiveContainer.js
+++ b/src/containers/DownloadSolutionArchiveContainer/DownloadSolutionArchiveContainer.js
@@ -13,9 +13,14 @@ import OptionalTooltipWrapper from '../../components/widgets/OptionalTooltipWrap
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import { toPlainAscii } from '../../helpers/common';
 
-const solutionArchiveFileName = (solutionId, user) => {
-  const name = toPlainAscii(`${user.name.lastName}-${user.name.firstName}`);
-  return `${name}_${solutionId}.zip`;
+const solutionArchiveFileName = (solutionId, user, index = null) => {
+  const components = [user.name.lastName, user.name.firstName];
+  if (index) {
+    components.push(String(index).padStart(3, '0'));
+  }
+  components.push(solutionId);
+  const name = toPlainAscii(components.join('_').replaceAll(' ', '-'));
+  return `${name}.zip`;
 };
 
 const DownloadSolutionArchiveContainer = ({
@@ -50,6 +55,8 @@ const DownloadSolutionArchiveContainer = ({
 );
 
 DownloadSolutionArchiveContainer.propTypes = {
+  solutionId: PropTypes.string.isRequired,
+  attemptIndex: PropTypes.number,
   authorId: PropTypes.string.isRequired,
   isReference: PropTypes.bool,
   iconOnly: PropTypes.bool,
@@ -64,10 +71,10 @@ export default connect(
   (state, { authorId }) => ({
     authorUser: getUser(authorId)(state),
   }),
-  (dispatch, { solutionId }) => ({
+  (dispatch, { solutionId, attemptIndex }) => ({
     downloadSolutionArchive: user => e => {
       e.preventDefault();
-      dispatch(downloadSolutionArchive(solutionId, solutionArchiveFileName(solutionId, user)));
+      dispatch(downloadSolutionArchive(solutionId, solutionArchiveFileName(solutionId, user, attemptIndex)));
     },
     downloadRefSolutionArchive: user => e => {
       e.preventDefault();