diff --git a/src/test/acceptance/conftest.py b/src/test/acceptance/conftest.py
index c2304ef0b..5b7f4d5ed 100644
--- a/src/test/acceptance/conftest.py
+++ b/src/test/acceptance/conftest.py
@@ -1,3 +1,4 @@
+from http import HTTPStatus
 from pathlib import Path
 
 import pytest
@@ -91,5 +92,5 @@ def upload_test_firmware(test_client, test_fw):
         }
         rv = test_client.post('/upload', content_type='multipart/form-data', data=data, follow_redirects=True)
 
-    assert b'Upload Successful' in rv.data, 'upload not successful'
+    assert rv.status_code == HTTPStatus.OK, 'upload not successful'
     assert test_fw.uid.encode() in rv.data, 'uid not found on upload success page'
diff --git a/src/test/acceptance/test_misc.py b/src/test/acceptance/test_misc.py
index c5fc519e1..977b00055 100644
--- a/src/test/acceptance/test_misc.py
+++ b/src/test/acceptance/test_misc.py
@@ -1,4 +1,5 @@
 import json
+from http import HTTPStatus
 from urllib.parse import quote
 
 import pytest
@@ -44,7 +45,7 @@ def _upload_firmware_put(self, test_client, path, device_name, uid):
                 'analysis_systems': [],
             }
             rv = test_client.post('/upload', content_type='multipart/form-data', data=data, follow_redirects=True)
-        assert b'Upload Successful' in rv.data, 'upload not successful'
+        assert rv.status_code == HTTPStatus.OK, 'upload not successful'
         assert uid.encode() in rv.data, 'uid not found on upload success page'
 
     def _show_stats(self, test_client):
diff --git a/src/test/unit/web_interface/test_app_re_analyze.py b/src/test/unit/web_interface/test_app_re_analyze.py
index abc231b9b..f3fee9261 100644
--- a/src/test/unit/web_interface/test_app_re_analyze.py
+++ b/src/test/unit/web_interface/test_app_re_analyze.py
@@ -1,4 +1,5 @@
 import re
+from http import HTTPStatus
 
 from helperFunctions.data_conversion import make_bytes
 from test.common_helper import TEST_FW
@@ -35,7 +36,7 @@ def test_app_re_analyze_post_valid(self, test_client, intercom_task_list):
             'analysis_systems': ['new_system'],
         }
         rv = test_client.post(f'/update-analysis/{TEST_FW.uid}', data=form_data)
-        assert b'Upload Successful' in rv.data
+        assert rv.status_code == HTTPStatus.OK, 'upload not successful'
         assert make_bytes(TEST_FW.uid) in rv.data
         assert intercom_task_list[0].uid == TEST_FW.uid, 'fw not added to intercom'
         assert 'new_system' in intercom_task_list[0].scheduled_analysis, 'new analysis system not scheduled'
diff --git a/src/test/unit/web_interface/test_app_upload.py b/src/test/unit/web_interface/test_app_upload.py
index 4f73de688..6ec4580af 100644
--- a/src/test/unit/web_interface/test_app_upload.py
+++ b/src/test/unit/web_interface/test_app_upload.py
@@ -1,4 +1,5 @@
 import re
+from http import HTTPStatus
 from io import BytesIO
 
 
@@ -46,7 +47,7 @@ def test_app_upload_valid_firmware(self, test_client, intercom_task_list):
             },
             follow_redirects=True,
         )
-        assert b'Upload Successful' in rv.data
+        assert rv.status_code == HTTPStatus.OK, 'upload not successful'
         assert b'c1f95369a99b765e93c335067e77a7d91af3076d2d3d64aacd04e1e0a810b3ed_17' in rv.data
         assert (
             intercom_task_list[0].uid == 'c1f95369a99b765e93c335067e77a7d91af3076d2d3d64aacd04e1e0a810b3ed_17'
diff --git a/src/web_interface/components/analysis_routes.py b/src/web_interface/components/analysis_routes.py
index 308ea9341..0ca422d9a 100644
--- a/src/web_interface/components/analysis_routes.py
+++ b/src/web_interface/components/analysis_routes.py
@@ -173,7 +173,7 @@ def post_update_analysis(self, uid, re_do=False):
             raise
         force_reanalysis = request.form.get('force_reanalysis') == 'true'
         self._schedule_re_analysis_task(uid, analysis_task, re_do, force_reanalysis)
-        return render_template('upload/upload_successful.html', uid=uid)
+        return uid
 
     def _schedule_re_analysis_task(self, uid, analysis_task, re_do, force_reanalysis=False):
         if re_do:
diff --git a/src/web_interface/components/io_routes.py b/src/web_interface/components/io_routes.py
index 90d989e2b..eab601a5e 100644
--- a/src/web_interface/components/io_routes.py
+++ b/src/web_interface/components/io_routes.py
@@ -35,7 +35,7 @@ def post_upload(self):
             raise
         fw = convert_analysis_task_to_fw_obj(analysis_task)
         self.intercom.add_analysis_task(fw)
-        return render_template('upload/upload_successful.html', uid=analysis_task['uid'])
+        return analysis_task['uid']
 
     @roles_accepted(*PRIVILEGES['submit_analysis'])
     @AppRoute('/upload', GET)
diff --git a/src/web_interface/static/package-lock.json b/src/web_interface/static/package-lock.json
index 516f4e749..915d491cc 100644
--- a/src/web_interface/static/package-lock.json
+++ b/src/web_interface/static/package-lock.json
@@ -13,6 +13,7 @@
         "@graphiql/plugin-explorer": "^3.0.2",
         "@graphiql/toolkit": "^0.9.1",
         "@highlightjs/cdn-assets": "^11.8.0",
+        "axios": "^1.9.0",
         "bootstrap": "^4.6.2",
         "bootstrap-datepicker": "^1.9.0",
         "bootstrap-select": "^1.13.18",
@@ -1012,6 +1013,23 @@
         "node": ">=10"
       }
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
+    "node_modules/axios": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
+      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/bootstrap": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
@@ -1056,6 +1074,19 @@
         "jquery": "3"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/chart.js": {
       "version": "2.9.4",
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
@@ -1140,6 +1171,18 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -1159,6 +1202,15 @@
       "resolved": "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz",
       "integrity": "sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg=="
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/detect-node-es": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
@@ -1187,6 +1239,20 @@
         "highlight.js": "11.6.0"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -1199,6 +1265,87 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
+      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/framer-motion": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-6.5.1.tgz",
@@ -1227,6 +1374,39 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/get-nonce": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
@@ -1235,6 +1415,31 @@
         "node": ">=6"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graphiql": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-3.2.3.tgz",
@@ -1278,6 +1483,45 @@
         "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2"
       }
     },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/hey-listen": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/hey-listen/-/hey-listen-1.0.8.tgz",
@@ -1427,6 +1671,15 @@
         "markdown-it": "bin/markdown-it.mjs"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/mdurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
@@ -1450,6 +1703,27 @@
         }
       }
     },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mkdirp": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
@@ -1508,6 +1782,12 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    },
     "node_modules/punycode.js": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
diff --git a/src/web_interface/static/package.json b/src/web_interface/static/package.json
index 41a95ad1f..45852e14f 100644
--- a/src/web_interface/static/package.json
+++ b/src/web_interface/static/package.json
@@ -4,6 +4,7 @@
     "@graphiql/plugin-explorer": "^3.0.2",
     "@graphiql/toolkit": "^0.9.1",
     "@highlightjs/cdn-assets": "^11.8.0",
+    "axios": "^1.9.0",
     "bootstrap": "^4.6.2",
     "bootstrap-datepicker": "^1.9.0",
     "bootstrap-select": "^1.13.18",
diff --git a/src/web_interface/templates/upload/upload.html b/src/web_interface/templates/upload/upload.html
index 110ef08b2..ee5df4d3c 100644
--- a/src/web_interface/templates/upload/upload.html
+++ b/src/web_interface/templates/upload/upload.html
@@ -14,6 +14,8 @@
     </script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/upload.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/loading.js') }}"></script>
+    <script type="text/javascript"
+            src="{{ url_for('static', filename='node_modules/axios/dist/axios.min.js') }}"></script>
     <script>
         $(window).bind("pageshow", function (_) {
             // if we come back to the page, make sure that the loading gif is not covering up the form
@@ -40,7 +42,7 @@
 {%- block body -%}
 
     <div class="row justify-content-center">
-        <div class="col-xl-6 col-lg-8 mt-4">
+        <div class="col-xl-6 col-lg-8 mt-4" id="upload-form-container">
             {%- if is_reanalysis %}
                 <h3 class="mb-1">{{ title }} of</h3>
                 <h5 class="mb-3">{{ firmware.uid | replace_uid_with_hid }}</h5>
@@ -50,7 +52,7 @@ <h3 class="mb-3">Upload Firmware</h3>
 
             <div id="form">
                 <form class="form-horizontal" action="" method=post enctype=multipart/form-data
-                      onsubmit="return showImg()">
+                      onsubmit="return showImg()" id="upload-form">
 
                     {# File #}
                     <div class="input-group mb-3">
@@ -181,6 +183,64 @@ <h3 class="mb-3">Upload Firmware</h3>
             <img id="loading_img" src="{{ url_for('.static', filename='Pacman.gif') }}"
                  alt="loading..." style="display: none; margin: auto;"/>
         </div>
+        <div class="col-xl-6 col-lg-8 mt-4" id="upload-progress-container" style="display: none;">
+            <div class="progress mt-4" style="height: 25px;" id="upload-progress">
+                <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
+                     aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;">
+                    0%
+                </div>
+            </div>
+            <div id="upload-status">
+                <h5 class="mt-4" style="text-align: center;">
+                    Please wait while upload is in progress.
+                </h5>
+            </div>
+        </div>
     </div>
 
+    <script>
+        function updateProgress(progressBarElement, progressPercentage) {
+            progressBarElement.style.width = `${progressPercentage}%`;
+            progressBarElement.setAttribute('aria-valuenow', progressPercentage);
+            progressBarElement.textContent = `${progressPercentage}%`;
+        }
+
+        const form = document.getElementById('upload-form');
+        form.addEventListener('submit', (event) => {
+            event.preventDefault();
+            const formData = new FormData(form);
+            document.getElementById("upload-form-container").style.display = "none";
+            document.getElementById("upload-progress-container").style.display = "block";
+            const progressBarContainer = document.getElementById('upload-progress');
+            const progressBar = progressBarContainer.querySelector('.progress-bar');
+
+            updateProgress(progressBar, 0);
+            axios.post(location.pathname, formData, {
+                headers: {'Content-Type': 'multipart/form-data'},
+                onUploadProgress: (progressEvent) => {
+                    const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+                    updateProgress(progressBar, percentCompleted);
+                }
+            })
+                .then((response) => {
+                    progressBar.classList.remove('progress-bar-animated');
+                    progressBar.classList.add('bg-success');
+                    const uid = response.data;
+                    document.getElementById('upload-status').innerHTML = `
+                        <div class="alert alert-success mt-4">
+                            <h3 class="alert-heading">Upload Successful</h3>
+                            <hr />
+                            The analysis results will be available <a href="/analysis/${uid}"><i class="fas fa-arrow-up-right-from-square"></i> here</a> when ready.
+                            You can monitor the analysis and unpacking progress <a href="/system_health"><i class="fas fa-arrow-up-right-from-square"></i> here</a>.
+                        </div>
+                    `
+                })
+                .catch((error) => {
+                    progressBar.classList.remove('progress-bar-animated');
+                    progressBar.classList.add('bg-danger');
+                    progressBar.textContent = `Error during upload: ${error}`;
+                });
+        });
+    </script>
+
 {%- endblock -%}
diff --git a/src/web_interface/templates/upload/upload_successful.html b/src/web_interface/templates/upload/upload_successful.html
deleted file mode 100644
index 2eabd6a84..000000000
--- a/src/web_interface/templates/upload/upload_successful.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% set active_page = "Upload" %}
-
-{% block body %}
-    <div class="alert alert-success mt-4">
-        <h3 class="alert-heading">Upload Successful</h3>
-        <hr />
-        The analysis results will be available <a href="/analysis/{{ uid | safe }}"><i class="fas fa-arrow-up-right-from-square"></i> here</a> when ready.
-        You can monitor the analysis and unpacking progress <a href="/system_health"><i class="fas fa-arrow-up-right-from-square"></i> here</a>.
-    </div>
-{% endblock %}