diff --git a/quattor/aii/config.pan b/quattor/aii/config.pan
index 330db1eda..4d98df4c2 100644
--- a/quattor/aii/config.pan
+++ b/quattor/aii/config.pan
@@ -8,7 +8,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# server, 15.2.0-rc6, rc6_1, 20150319-2030
+# server, 15.2.0, 1, 20150323-1249
 #
 #
 # This file is the standard aii configuration. It only performs some
diff --git a/quattor/aii/dhcp/config.pan b/quattor/aii/dhcp/config.pan
index 8fbabc3c1..88374f209 100644
--- a/quattor/aii/dhcp/config.pan
+++ b/quattor/aii/dhcp/config.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# dhcp, 15.2.0-rc6, rc6_1, 20150319-2030
+# dhcp, 15.2.0, 1, 20150323-1249
 #
 template quattor/aii/dhcp/config;
 
diff --git a/quattor/aii/dhcp/rpms.pan b/quattor/aii/dhcp/rpms.pan
index dd7b15959..081523bd2 100644
--- a/quattor/aii/dhcp/rpms.pan
+++ b/quattor/aii/dhcp/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-# dhcp, 15.2.0-rc6, rc6_1, 20150319-2030
+# dhcp, 15.2.0, 1, 20150323-1249
 #
 
 # Template adding aii-dhcp rpm to the configuration
 
 unique template quattor/aii/dhcp/rpms;
 
-"/software/packages"=pkg_repl("aii-dhcp","15.2.0-rc6_1","noarch");
+"/software/packages"=pkg_repl("aii-dhcp","15.2.0-1","noarch");
diff --git a/quattor/aii/dhcp/schema.pan b/quattor/aii/dhcp/schema.pan
index fc32ae8e1..ba0001567 100644
--- a/quattor/aii/dhcp/schema.pan
+++ b/quattor/aii/dhcp/schema.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# dhcp, 15.2.0-rc6, rc6_1, 20150319-2030
+# dhcp, 15.2.0, 1, 20150323-1249
 #
 
 unique template quattor/aii/dhcp/schema;
diff --git a/quattor/aii/ks/config.pan b/quattor/aii/ks/config.pan
index bf2773cc7..d9770f888 100644
--- a/quattor/aii/ks/config.pan
+++ b/quattor/aii/ks/config.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# ks, 15.2.0-rc6, rc6_1, 20150319-2030
+# ks, 15.2.0, 1, 20150323-1249
 #
 
 # Template containing the Kickstart-related configuration and default
diff --git a/quattor/aii/ks/rpms.pan b/quattor/aii/ks/rpms.pan
index f1c099b54..4212ecb04 100644
--- a/quattor/aii/ks/rpms.pan
+++ b/quattor/aii/ks/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-# ks, 15.2.0-rc6, rc6_1, 20150319-2030
+# ks, 15.2.0, 1, 20150323-1249
 #
 
 # Template adding aii-ks rpm to the configuration
 
 unique template quattor/aii/ks/rpms;
 
-"/software/packages"=pkg_repl("aii-ks","15.2.0-rc6_1","noarch");
+"/software/packages"=pkg_repl("aii-ks","15.2.0-1","noarch");
diff --git a/quattor/aii/ks/schema.pan b/quattor/aii/ks/schema.pan
index 583d2e02d..e854397e7 100644
--- a/quattor/aii/ks/schema.pan
+++ b/quattor/aii/ks/schema.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# ks, 15.2.0-rc6, rc6_1, 20150319-2030
+# ks, 15.2.0, 1, 20150323-1249
 #
 # Structure for the component generating kickstart files.
 
diff --git a/quattor/aii/ks/variants/fedora14.pan b/quattor/aii/ks/variants/fedora14.pan
index 28a98c769..66f3dd2e4 100644
--- a/quattor/aii/ks/variants/fedora14.pan
+++ b/quattor/aii/ks/variants/fedora14.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# ks, 15.2.0-rc6, rc6_1, 20150319-2030
+# ks, 15.2.0, 1, 20150323-1249
 #
 
 # Template containing OS configuration and default values.
diff --git a/quattor/aii/ks/variants/sl6.pan b/quattor/aii/ks/variants/sl6.pan
index 18c7a3cc3..153c1b6f6 100644
--- a/quattor/aii/ks/variants/sl6.pan
+++ b/quattor/aii/ks/variants/sl6.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# ks, 15.2.0-rc6, rc6_1, 20150319-2030
+# ks, 15.2.0, 1, 20150323-1249
 #
 
 # Template containing OS configuration and default values.
diff --git a/quattor/aii/pxelinux/config.pan b/quattor/aii/pxelinux/config.pan
index 5d9e4f36d..d72d8eb41 100644
--- a/quattor/aii/pxelinux/config.pan
+++ b/quattor/aii/pxelinux/config.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# pxelinux, 15.2.0-rc6, rc6_1, 20150319-2030
+# pxelinux, 15.2.0, 1, 20150323-1249
 #
 template quattor/aii/pxelinux/config;
 
diff --git a/quattor/aii/pxelinux/rpms.pan b/quattor/aii/pxelinux/rpms.pan
index 32f6af5eb..1a6e8ad92 100644
--- a/quattor/aii/pxelinux/rpms.pan
+++ b/quattor/aii/pxelinux/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-# pxelinux, 15.2.0-rc6, rc6_1, 20150319-2030
+# pxelinux, 15.2.0, 1, 20150323-1249
 #
 
 # Template adding aii-pxelinux rpm to the configuration
 
 unique template quattor/aii/pxelinux/rpms;
 
-"/software/packages"=pkg_repl("aii-pxelinux","15.2.0-rc6_1","noarch");
+"/software/packages"=pkg_repl("aii-pxelinux","15.2.0-1","noarch");
diff --git a/quattor/aii/pxelinux/schema.pan b/quattor/aii/pxelinux/schema.pan
index cac5fc6e4..d5515aad3 100644
--- a/quattor/aii/pxelinux/schema.pan
+++ b/quattor/aii/pxelinux/schema.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# pxelinux, 15.2.0-rc6, rc6_1, 20150319-2030
+# pxelinux, 15.2.0, 1, 20150323-1249
 #
 unique template quattor/aii/pxelinux/schema;
 
diff --git a/quattor/aii/rpms.pan b/quattor/aii/rpms.pan
index ebb9f21ac..3ff0ef325 100644
--- a/quattor/aii/rpms.pan
+++ b/quattor/aii/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-# server, 15.2.0-rc6, rc6_1, 20150319-2030
+# server, 15.2.0, 1, 20150323-1249
 #
 
 # Template adding aii-server rpm to the configuration
 
 unique template quattor/aii/rpms;
 
-"/software/packages"=pkg_repl("aii-server","15.2.0-rc6_1","noarch");
+"/software/packages"=pkg_repl("aii-server","15.2.0-1","noarch");
diff --git a/quattor/aii/schema.pan b/quattor/aii/schema.pan
index a01a999a7..39d5f475c 100644
--- a/quattor/aii/schema.pan
+++ b/quattor/aii/schema.pan
@@ -8,7 +8,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# server, 15.2.0-rc6, rc6_1, 20150319-2030
+# server, 15.2.0, 1, 20150323-1249
 #
 unique template quattor/aii/schema;