diff --git a/apache/server/single.yml b/apache/server/single.yml
new file mode 100644
index 0000000..06c8c4c
--- /dev/null
+++ b/apache/server/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.apache.server.single
diff --git a/cinder/control/notification/cadf.yml b/cinder/control/notification/cadf.yml
new file mode 100644
index 0000000..813dade
--- /dev/null
+++ b/cinder/control/notification/cadf.yml
@@ -0,0 +1,5 @@
+parameters:
+  cinder:
+    controller:
+      audit:
+        enabled: true
diff --git a/glance/control/notification/cadf.yml b/glance/control/notification/cadf.yml
new file mode 100644
index 0000000..0f2fbae
--- /dev/null
+++ b/glance/control/notification/cadf.yml
@@ -0,0 +1,5 @@
+parameters:
+  glance:
+    server:
+      audit:
+        enabled: true
diff --git a/heat/server/notification/cadf.yml b/heat/server/notification/cadf.yml
new file mode 100644
index 0000000..352e936
--- /dev/null
+++ b/heat/server/notification/cadf.yml
@@ -0,0 +1,5 @@
+parameters:
+  heat:
+    server:
+      audit:
+        enabled: true
diff --git a/keystone/server/notification/cadf.yml b/keystone/server/notification/cadf.yml
new file mode 100644
index 0000000..dffb278
--- /dev/null
+++ b/keystone/server/notification/cadf.yml
@@ -0,0 +1,4 @@
+parameters:
+  keystone:
+    server:
+      notification_format: cadf
diff --git a/keystone/server/wsgi.yml b/keystone/server/wsgi.yml
new file mode 100644
index 0000000..2c8a19d
--- /dev/null
+++ b/keystone/server/wsgi.yml
@@ -0,0 +1,19 @@
+classes:
+- system.apache.server.single
+parameters:
+  keystone:
+    server:
+      service_name: apache2
+  apache:
+    server:
+      enabled: true
+      default_mpm: event
+      site:
+        keystone:
+          enabled: true
+          type: keystone
+          name: wsgi
+          host:
+            name: ${linux:network:fqdn}
+      modules:
+        - wsgi
diff --git a/linux/system/repo/mos92.yml b/linux/system/repo/mos92.yml
new file mode 100644
index 0000000..999bfde
--- /dev/null
+++ b/linux/system/repo/mos92.yml
@@ -0,0 +1,28 @@
+parameters:
+  linux:
+    system:
+      repo:
+        mirantis_openstack:
+          source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/ mos9.0 main restricted"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/archive-mos9.0.key"
+        mirantis_openstack_holdback:
+          source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/ mos9.0-holdback main restricted"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/archive-mos9.0.key"
+        mirantis_openstack_hotfix:
+          source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/ mos9.0-hotfix main restricted"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/archive-mos9.0.key"
+        mirantis_openstack_proposed:
+          source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/ mos9.0-proposed main restricted"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/archive-mos9.0.key"
+        mirantis_openstack_security:
+          source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/ mos9.0-security main restricted"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/archive-mos9.0.key"
+        mirantis_openstack_updates:
+          source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/ mos9.0-updates main restricted"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.2/archive-mos9.0.key"
diff --git a/neutron/control/notification/cadf.yml b/neutron/control/notification/cadf.yml
new file mode 100644
index 0000000..f00f96f
--- /dev/null
+++ b/neutron/control/notification/cadf.yml
@@ -0,0 +1,5 @@
+parameters:
+  neutron:
+    server:
+      audit:
+        enabled: true
diff --git a/nova/control/notification/cadf.yml b/nova/control/notification/cadf.yml
new file mode 100644
index 0000000..2f2b1b1
--- /dev/null
+++ b/nova/control/notification/cadf.yml
@@ -0,0 +1,5 @@
+parameters:
+  nova:
+    controller:
+      audit:
+        enabled: true
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 7dd7b62..4fc748f 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -44,6 +44,13 @@
           full_name: Patrick Petit 
           home: /home/ppetit
           email: ppetit@mirantis.com
+        obourdon:
+          enabled: true
+          name: obourdon
+          sudo: true
+          full_name: Olivier Bourdon
+          home: /home/obourdon
+          email: obourdon@mirantis.com
   openssh:
     client:
       enabled: true
@@ -80,6 +87,11 @@
           public_keys:
           - ${public_keys:ppetit}
           user: ${linux:system:user:ppetit}
+        obourdon:
+          enable: true
+          public_keys:
+          - ${public_keys:obourdon}
+          user: ${linux:system:user:obourdon}
   public_keys:
     newt:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ newt@newt-dev1
@@ -93,3 +105,5 @@
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUfVxx6qi4fay4znw8M6yLJJcRr3pdvPPihTAszioFJP9V/GBbqfkofTfeKdpdvJ4j25p40boiDt43Ek7LfcRmKMP9+2SEfk9W7ec/umM8Mer+h4ocnShVQm69weELVUfr9q4G+qWf14ANc9D097bclqQ6FP/cjy8HodVPgQ+i1lpMjwP6xvAAERJJH353lCFsxkh2N8aOi9YcP9M2lQeKWM+eYFsdcmTFAPHbgPq0K4ma6/YXw5UibEBClYu1u4OJTFZSI3z8kERb2cU0aFGYAduiynDMBKM7y7YAoksgBOVprq0huEMFUqJ3vsrZbPn55GIpzmBga+EGnNbSCadt swann@scroiset
     ppetit:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUGCb+mGidT4FRa4rJxoYx39NX2vCjRw+CmCQJW/Uf6xc0NNp5WRWJ0hnyIMRVVfehvfjdXPo4bO4cXIwmo06C1Wx+DMyvjI9NvuHtt52p3QTsh+PYZe5t4hFuGh7veWQw3LuLtDLVlVS633FQMgT/BXDaBc65yfN9CuV6lHqZ6KPKoGAi3ADlcQFqhFttO+GsVkxd6uGtelnbYXsDMwylCIKop0C/obu6wG85d/8Q2/Zts5CvUcCiCNfZtl8otgNMrpfnuhC0xAsmgwDxqK2kshxUujclyFfO7ixl+E9Plc7kUJvodNbzOcAmY3YpuHVoJQkHx/Ou81/q+JOVtFxz ppetit@baobab 
+    obourdon:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOd0PnoQhjjo/UrmCotaGZxXfpxLoMmuZ+XjKqAkEb9kE+aE0+k8t2EUs8PIctEgIcIC9vmovqOzIt5uNLV5MyN4R+pdIBKyWEQ5fQPaFhn/uZKf7AxLYhTVVW1wM+cDzrpWTyNQ0w59JBfNPZ/BDMtdpch9gTP24pwJ8yUDHHMSt1FnVqa7+Czw8jig4/oM05Mob5DQKlWOdtdUP3XYHSGJuHY4tHmc5sPvzIqs5r47uj5VD4gaCUqYeRS2C1YJcisN880qIqUHuCK0k9gQP+0DKJPVPmPPCuwebBzUUfjhKcbqiikKxPS0p4DWiprmeF8xjvmVWX+V8lP/v0hXiVgMc3wMoXJklH+XM7U5y5uzN8MF4YqAi4M/uSK5UF+TPn5dtu9s+joQmqt5XXaV4iFQe5kcdIYEMNJUGxiwMzByhvqWgC1reYSD8FquqLTH/5ITvFFmaTyQbBJMnXAE+QxdTXMfhTnfI/pbbhAUmfr5w8Z34lZG5UDnUy/rR+LlvJS76MqCr3nemZTHqhUYIrIJA8f9Xa8o9UJTy2QICdj2NidW1UzHCPybc/nH7qc6TjZJALLdhzK2QDbO6seJLOXuVHwSxjOx2Jdv5HImpFSeEfiGRQqc8bT+NGZI5V+cW+FuztU8i46VaSPXFM8t+57Ut/MdndAVYSPqgc7E3u3w== obourdon@mirantis.com