diff --git a/src/cell.h b/src/cell.h
index 9f3971dd59c943ebd49a9ac1c812b612ab68bdaf..dc9606e37200a4fb334375bd89a89f7123437cb0 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -44,7 +44,7 @@ struct space;
  * The maximum was lowered by a further factor of 2 to be on the safe side.*/
 #define cell_max_tag (1 << 29)
 
-#define cell_align 32
+#define cell_align 128
 
 /* Global variables. */
 extern int cell_next_tag;
@@ -205,7 +205,7 @@ struct cell {
 
 #endif
 
-} __attribute__((aligned(cell_align)));
+} __attribute__((aligned(32)));
 
 /* Convert cell location to ID. */
 #define cell_getid(cdim, i, j, k) \
diff --git a/src/gravity/Default/gravity_part.h b/src/gravity/Default/gravity_part.h
index 1850ff0a1644d3593f78f150646eae8b2f074e1e..e85cf30d795a3373258e2e014f451e911d3a55a3 100644
--- a/src/gravity/Default/gravity_part.h
+++ b/src/gravity/Default/gravity_part.h
@@ -53,6 +53,6 @@ struct gpart {
      which this gpart is linked. */
   long long id_or_neg_offset;
 
-} __attribute__((aligned(gpart_align)));
+} __attribute__((aligned(32)));
 
 #endif /* SWIFT_DEFAULT_GRAVITY_PART_H */
diff --git a/src/hydro/Default/hydro_part.h b/src/hydro/Default/hydro_part.h
index f42c3dc886ae1ab8f472ffdf5ff508f6735d1bb1..46c5d0e29ef0cbc21997ea02d12cd8e916d6c4c1 100644
--- a/src/hydro/Default/hydro_part.h
+++ b/src/hydro/Default/hydro_part.h
@@ -33,7 +33,7 @@ struct xpart {
   /* Old density. */
   float omega;
 
-} __attribute__((aligned(xpart_align)));
+} __attribute__((aligned(32)));
 
 /* Data of a single particle. */
 struct part {
@@ -120,6 +120,6 @@ struct part {
   /* Pointer to corresponding gravity part. */
   struct gpart* gpart;
 
-} __attribute__((aligned(part_align)));
+} __attribute__((aligned(32)));
 
 #endif /* SWIFT_DEFAULT_HYDRO_PART_H */
diff --git a/src/hydro/Gadget2/hydro_part.h b/src/hydro/Gadget2/hydro_part.h
index 484792438d2717413c1ca8d4f429eac2e6d21b20..3fd5c28d22b4aa30bbb1a0f12571f079c297c0d7 100644
--- a/src/hydro/Gadget2/hydro_part.h
+++ b/src/hydro/Gadget2/hydro_part.h
@@ -28,7 +28,7 @@ struct xpart {
   /* Velocity at the last full step. */
   float v_full[3];
 
-} __attribute__((aligned(xpart_align)));
+} __attribute__((aligned(32)));
 
 /* Data of a single particle. */
 struct part {
@@ -110,6 +110,6 @@ struct part {
   /* Pointer to corresponding gravity part. */
   struct gpart* gpart;
 
-} __attribute__((aligned(part_align)));
+} __attribute__((aligned(32)));
 
 #endif /* SWIFT_GADGET2_HYDRO_PART_H */
diff --git a/src/hydro/Gizmo/hydro_part.h b/src/hydro/Gizmo/hydro_part.h
index d425294671d4bc172f45c928c2290f8cfa8e093c..c7983f9f94f321f330ad26645393728df6b2f04b 100644
--- a/src/hydro/Gizmo/hydro_part.h
+++ b/src/hydro/Gizmo/hydro_part.h
@@ -26,7 +26,7 @@ struct xpart {
   /* Velocity at the last full step. */
   float v_full[3];
 
-} __attribute__((aligned(xpart_align)));
+} __attribute__((aligned(32)));
 
 /* Data of a single particle. */
 struct part {
@@ -196,4 +196,4 @@ struct part {
   /* Associated gravitas. */
   struct gpart *gpart;
 
-} __attribute__((aligned(part_align)));
+} __attribute__((aligned(32)));
diff --git a/src/hydro/Minimal/hydro_part.h b/src/hydro/Minimal/hydro_part.h
index ad65f8b44fc67f4aae6470246cbab91bc3710007..2110730620853e9abb86717ff4df7febe7063a45 100644
--- a/src/hydro/Minimal/hydro_part.h
+++ b/src/hydro/Minimal/hydro_part.h
@@ -47,7 +47,7 @@ struct xpart {
 
   float v_full[3]; /*!< Velocity at the last full step. */
 
-} __attribute__((aligned(xpart_align)));
+} __attribute__((aligned(32)));
 
 /**
  * @brief Particle fields for the SPH particles
@@ -120,6 +120,6 @@ struct part {
 
   struct gpart* gpart; /*!< Pointer to corresponding gravity part. */
 
-} __attribute__((aligned(part_align)));
+} __attribute__((aligned(32)));
 
 #endif /* SWIFT_MINIMAL_HYDRO_PART_H */
diff --git a/src/part.h b/src/part.h
index ea895e6e0295d6a8b63309c7bd6855daa2cf7d64..63996160e857ce3aae9ba4acce46a92e96c7e8fa 100644
--- a/src/part.h
+++ b/src/part.h
@@ -34,9 +34,9 @@
 #include "const.h"
 
 /* Some constants. */
-#define part_align 64
-#define xpart_align 32
-#define gpart_align 32
+#define part_align 128
+#define xpart_align 128
+#define gpart_align 128
 
 /* Import the right hydro particle definition */
 #if defined(MINIMAL_SPH)