diff --git a/releases/2008.0/specs/amd64/hardened/stage1-nomultilib.spec b/releases/2008.0/specs/amd64/hardened/stage1-nomultilib.spec
index 69f45075..89b2a694 100644
--- a/releases/2008.0/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/2008.0/specs/amd64/hardened/stage1-nomultilib.spec
@@ -2,8 +2,8 @@ subarch: amd64
 target: stage1
 version_stamp: hardened+nomultilib-2008.0
 rel_type: default
-profile: hardened/amd64
+profile: hardened/linux/amd64/2008.0/no-multilib
 snapshot: 2008.0
-source_subpath: default/stage3-amd64-hardened-2007.0
+source_subpath: stage3-amd64-hardened-2007.0
 cflags: -O2 -pipe -fforce-addr
 cxxflags: -O2 -pipe -fforce-addr
diff --git a/releases/2008.0/specs/amd64/hardened/stage1.spec b/releases/2008.0/specs/amd64/hardened/stage1.spec
index 51c0fcfb..b4fd3d0a 100644
--- a/releases/2008.0/specs/amd64/hardened/stage1.spec
+++ b/releases/2008.0/specs/amd64/hardened/stage1.spec
@@ -1,7 +1,9 @@
 subarch: amd64
 target: stage1
 version_stamp: hardened-2008.0
-rel_type: hardened
-profile: hardened/linux/amd64
+rel_type: default
+profile: hardened/linux/amd64/2008.0
 snapshot: 2008.0
-source_subpath: hardened/stage3-amd64-hardened-multilib-2007.0
+source_subpath: stage3-amd64-hardened-multilib-2007.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr
diff --git a/releases/2008.0/specs/amd64/hardened/stage2-nomultilib.spec b/releases/2008.0/specs/amd64/hardened/stage2-nomultilib.spec
index e7a301af..7c5639cb 100644
--- a/releases/2008.0/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/2008.0/specs/amd64/hardened/stage2-nomultilib.spec
@@ -1,7 +1,9 @@
 subarch: amd64
 target: stage2
 version_stamp: hardened+nomultilib-2008.0
-rel_type: hardened
-profile: hardened/linux/amd64/no-multilib
+rel_type: default
+profile: hardened/linux/amd64/2008.0/no-multilib
 snapshot: 2008.0
-source_subpath: hardened/stage1-amd64-hardened-2008.0
+source_subpath: default/stage1-amd64-hardened+nomultilib-2008.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr
diff --git a/releases/2008.0/specs/amd64/hardened/stage2.spec b/releases/2008.0/specs/amd64/hardened/stage2.spec
index 583c589e..561fd52f 100644
--- a/releases/2008.0/specs/amd64/hardened/stage2.spec
+++ b/releases/2008.0/specs/amd64/hardened/stage2.spec
@@ -1,7 +1,9 @@
 subarch: amd64
 target: stage2
 version_stamp: hardened-2008.0
-rel_type: hardened
-profile: hardened/linux/amd64
+rel_type: default
+profile: hardened/linux/amd64/2008.0
 snapshot: 2008.0
-source_subpath: hardened/stage1-amd64-hardened-2008.0
+source_subpath: default/stage1-amd64-hardened-2008.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr
diff --git a/releases/2008.0/specs/amd64/hardened/stage3-nomultilib.spec b/releases/2008.0/specs/amd64/hardened/stage3-nomultilib.spec
index 1410fb15..3736abe3 100644
--- a/releases/2008.0/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/2008.0/specs/amd64/hardened/stage3-nomultilib.spec
@@ -1,7 +1,9 @@
 subarch: amd64
 target: stage3
 version_stamp: hardened+nomultilib-2008.0
-rel_type: hardened
-profile: hardened/linux/amd64/no-multilib
+rel_type: default
+profile: hardened/linux/amd64/2008.0/no-multilib
 snapshot: 2008.0
-source_subpath: hardened/stage2-amd64-hardened+nomultilib-2008.0
+source_subpath: default/stage2-amd64-hardened+nomultilib-2008.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr
diff --git a/releases/2008.0/specs/amd64/hardened/stage3.spec b/releases/2008.0/specs/amd64/hardened/stage3.spec
index 14d8434a..f0686517 100644
--- a/releases/2008.0/specs/amd64/hardened/stage3.spec
+++ b/releases/2008.0/specs/amd64/hardened/stage3.spec
@@ -1,7 +1,9 @@
 subarch: amd64
 target: stage3
 version_stamp: hardened-2008.0
-rel_type: hardened
-profile: hardened/linux/amd64/
+rel_type: default
+profile: hardened/linux/amd64/2008.0
 snapshot: 2008.0
-source_subpath: hardened/stage2-amd64-hardened-2008.0
+source_subpath: default/stage2-amd64-hardened-2008.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr