diff --git a/pyproject.toml b/pyproject.toml
index 93387840..783b6024 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,8 +44,11 @@ package-dir = { "" = "src" }
 
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements.txt"] }
-optional-dependencies.cuda = { file = ["requirements-cuda.txt"] }
-optional-dependencies.rocm = { file = ["requirements-rocm.txt"] }
+optional-dependencies.cpu = { file = ["requirements/cpu.txt"] }
+optional-dependencies.cuda = { file = ["requirements/cuda.txt"] }
+optional-dependencies.hpu = { file = ["requirements/hpu.txt"] }
+optional-dependencies.mps = { file = ["requirements/mps.txt"] }
+optional-dependencies.rocm = { file = ["requirements/rocm.txt"] }
 
 [tool.setuptools.packages.find]
 where = ["src"]
diff --git a/requirements.txt b/requirements.txt
index b31fbdcb..733ca868 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ pyyaml
 py-cpuinfo
 # we set this to be above 0a0 so that it doesn't
 # replace custom pytorch images with the 2.3.0
-torch>=2.3.0a0
+torch>=2.4.1,<2.5.0
 transformers>=4.41.2
 accelerate>=0.34.2
 datasets>=2.15.0
diff --git a/requirements/cpu.txt b/requirements/cpu.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/requirements-cuda.txt b/requirements/cuda.txt
similarity index 100%
rename from requirements-cuda.txt
rename to requirements/cuda.txt
diff --git a/requirements/hpu.txt b/requirements/hpu.txt
new file mode 100644
index 00000000..c9dc8190
--- /dev/null
+++ b/requirements/hpu.txt
@@ -0,0 +1,12 @@
+# Dependencies for Intel Gaudi / Habana Labs HPU devices
+
+# Habana Labs 1.17.1 has PyTorch 2.3.1a0+gitxxx pre-release
+torch>=2.3.1a0,<2.4.0
+# Habana Labs frameworks
+habana-torch-plugin>=1.17.1
+habana_gpu_migration>=1.17.1
+# additional Habana Labs packages (installed, but not used)
+#habana-media-loader
+#habana-pyhlml
+#habana_quantization_toolkit
+#habana-torch-dataloader
diff --git a/requirements/mps.txt b/requirements/mps.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/requirements/rocm.txt b/requirements/rocm.txt
new file mode 100644
index 00000000..e69de29b