diff --git a/specs/2007.0/amd64/hardened/stage1-amd64-multilib.spec b/specs/2007.0/amd64/hardened/stage1-multilib.spec
similarity index 100%
rename from specs/2007.0/amd64/hardened/stage1-amd64-multilib.spec
rename to specs/2007.0/amd64/hardened/stage1-multilib.spec
diff --git a/specs/2007.0/amd64/hardened/stage1-amd64.spec b/specs/2007.0/amd64/hardened/stage1.spec
similarity index 100%
rename from specs/2007.0/amd64/hardened/stage1-amd64.spec
rename to specs/2007.0/amd64/hardened/stage1.spec
diff --git a/specs/2007.0/amd64/hardened/stage2-amd64-multilib.spec b/specs/2007.0/amd64/hardened/stage2-multilib.spec
similarity index 100%
rename from specs/2007.0/amd64/hardened/stage2-amd64-multilib.spec
rename to specs/2007.0/amd64/hardened/stage2-multilib.spec
diff --git a/specs/2007.0/amd64/hardened/stage2.spec b/specs/2007.0/amd64/hardened/stage2.spec
new file mode 100644
index 00000000..0a3008fc
--- /dev/null
+++ b/specs/2007.0/amd64/hardened/stage2.spec
@@ -0,0 +1,9 @@
+subarch: amd64
+target: stage2
+version_stamp: hardened-2007.0
+rel_type: default
+profile: hardened/amd64
+snapshot: 2007.0
+source_subpath: default/stage1-amd64-hardened-2007.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr
diff --git a/specs/2007.0/amd64/hardened/stage3-amd64-multilib.spec b/specs/2007.0/amd64/hardened/stage3-multilib.spec
similarity index 100%
rename from specs/2007.0/amd64/hardened/stage3-amd64-multilib.spec
rename to specs/2007.0/amd64/hardened/stage3-multilib.spec
diff --git a/specs/2007.0/amd64/hardened/stage3.spec b/specs/2007.0/amd64/hardened/stage3.spec
new file mode 100644
index 00000000..bb6cdeb7
--- /dev/null
+++ b/specs/2007.0/amd64/hardened/stage3.spec
@@ -0,0 +1,9 @@
+subarch: amd64
+target: stage3
+version_stamp: hardened-2007.0
+rel_type: default
+profile: hardened/amd64
+snapshot: 2007.0
+source_subpath: default/stage2-amd64-hardened-2007.0
+cflags: -O2 -pipe -fforce-addr
+cxxflags: -O2 -pipe -fforce-addr