diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 2be4db6..7d11cd4 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -2,3 +2,39 @@
 - service.aodh.server.cluster
 - system.haproxy.proxy.listen.openstack.aodh
 - service.keepalived.cluster.single
+parameters:
+  aodh:
+    server:
+      enabled: true
+      version: ${_param:aodh_version}
+      cluster: true
+      ttl: 86400
+      debug: false
+      verbose: true
+      database:
+        engine: "mysql+pymysql"
+        host: ${_param:openstack_database_address}
+        port: 3306
+        name: aodh
+        user: aodh
+        password: ${_param:mysql_aodh_password}
+      bind:
+        host: ${_param:cluster_local_address}
+        port: 8042
+      identity:
+        engine: keystone
+        host: ${_param:keystone_service_host}
+        port: 35357
+        tenant: service
+        user: aodh
+        password: ${_param:keystone_aodh_password}
+      message_queue:
+        engine: rabbitmq
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
\ No newline at end of file
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index e0ae0e2..63111fd 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -31,4 +31,4 @@
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
         # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
-        rpc_thread_pool_size: 5
\ No newline at end of file
+        rpc_thread_pool_size: 5
diff --git a/ceph/client/single.yml b/ceph/client/single.yml
new file mode 100644
index 0000000..b01458f
--- /dev/null
+++ b/ceph/client/single.yml
@@ -0,0 +1,29 @@
+classes:
+- service.ceph.client.single
+parameters:
+  _param:
+    ceph_auth_client_required: cephx
+  ceph:
+    client:
+      config:
+        global:
+          fsid: ${_param:ceph_fsid}
+          mon_initial_members: ${_param:ceph_mon_initial_members}
+          mon_host: ${_param:ceph_mon_host}
+          auth_client_required: ${_param:ceph_auth_client_required}
+          public_network: ${_param:ceph_public_network}
+          cluster_network: ${_param:ceph_cluster_network}
+          osd_fs_mount_options_xfs: rw,noatime
+          osd_fs_type: xfs
+        osd:
+          filestore_xattr_use_omap: True
+          osd_journal_size: 7500
+        mon:
+          mon_debug_dump_transactions: False
+      # keyring:
+      #   object:
+      #     key: 
+      #   cinder:
+      #     key: 
+      #   nova:
+      #     key: 
\ No newline at end of file
diff --git a/cinder/control/backend/ceph.yml b/cinder/control/backend/ceph.yml
new file mode 100644
index 0000000..1026f68
--- /dev/null
+++ b/cinder/control/backend/ceph.yml
@@ -0,0 +1,13 @@
+parameters:
+  cinder:
+    controller:
+      default_volume_type: standard-iops
+      backend:
+        ceph:
+          type_name: standard-iops
+          backend: ceph
+          pool: ${_param:cinder_storage_pool}
+          engine: ceph
+          user: ${_param:cinder_storage_user}
+          secret_uuid: ${_param:cinder_storage_secret_uuid}
+          client_cinder_key: ${_param:cinder_storage_client_key}
diff --git a/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
new file mode 100644
index 0000000..6560add
--- /dev/null
+++ b/cinder/volume/backend/ceph.yml
@@ -0,0 +1,17 @@
+parameters:
+  cinder:
+    volume:
+      message_queue: 
+        ha_queues: true
+      enabled: true
+      notification: true
+      default_volume_type: standard-iops
+      backend:
+        ceph:
+          type_name: standard-iops
+          backend: ceph
+          pool: ${_param:cinder_storage_pool}
+          engine: ceph
+          user: ${_param:cinder_storage_user}
+          secret_uuid: ${_param:cinder_storage_secret_uuid}
+          client_cinder_key: ${_param:cinder_storage_client_key}
diff --git a/glance/control/storage/ceph.yml b/glance/control/storage/ceph.yml
new file mode 100644
index 0000000..ef3c033
--- /dev/null
+++ b/glance/control/storage/ceph.yml
@@ -0,0 +1,8 @@
+parameters:
+  glance:
+    server:
+      storage:
+        engine: rbd
+        user: ${_param:glance_storage_user}
+        pool: ${_param:glance_storage_pool}
+        chunk_size: 8
\ No newline at end of file
diff --git a/haproxy/proxy/listen/openstack/ceilometer.yml b/haproxy/proxy/listen/openstack/ceilometer.yml
index 766a985..68eef43 100644
--- a/haproxy/proxy/listen/openstack/ceilometer.yml
+++ b/haproxy/proxy/listen/openstack/ceilometer.yml
@@ -1,3 +1,4 @@
+parameters:
   haproxy:
     proxy:
       listen:
diff --git a/nova/compute/storage/ceph.yml b/nova/compute/storage/ceph.yml
new file mode 100644
index 0000000..c271952
--- /dev/null
+++ b/nova/compute/storage/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+  nova:
+    compute:
+      ceph:
+        enabled: true
+        ephemeral: yes
+        rbd_pool: ${_param:nova_storage_pool}
+        secret_uuid: ${_param:nova_storage_secret_uuid}
+        client_cinder_key: ${_param:nova_storage_secret_uuid}
+        rbd_user: ${_param:nova_storage_user}
\ No newline at end of file
diff --git a/openssh/server/team/mmo_de.yml b/openssh/server/team/mmo_de.yml
index b294f98..41be77a 100644
--- a/openssh/server/team/mmo_de.yml
+++ b/openssh/server/team/mmo_de.yml
@@ -26,6 +26,12 @@
           sudo: true
           full_name: Katarzyna Orlowska
           home: /home/korlowska
+        sflorczak:
+          enabled: true
+          name: sflorczak
+          sudo: true
+          full_name: Szymon Florczak
+          home: /home/sflorczak
   openssh:
     server:
       enabled: true
@@ -51,6 +57,11 @@
           public_keys:
           - ${public_keys:korlowska}
           user: ${linux:system:user:korlowska}
+        sflorczak:
+          enabled: true
+          public_keys:
+          - ${public_keys:sflorczak}
+          user: ${linux:system:user:sflorczak}
   public_keys:
     dszeluga:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEEFoCOaivah6AjFZmPIDlDlp8mUfsh9UFrjgLL8vqVYoyVnuZ5DQZTeZsCgFCPxodEsgHDkSEFwkB6hbyqEXszGIL8dWwSBR3QfNJD2cjZ8ZYqXsKN63RzHGAjTXMjlCB7TZtcui1SWpKjGd+x3gQ0KkHZI9V9WVYDcC75kyEAHZptM2N9jlwbhr9lXZ77gZacjaGoKN0Agb/ydd1TyhQ1F3g56pnvgZtkOe/bStwjpz2NS0FqiqAR3wOeZZUGsR3TCP70oYfaeJvpCDVRR/gVXqqvcBAiNYTGC/tMlKuECKPtOOAP8Oc+bt1eOrbiPVJ5NfoOIpmMCDUUSnFoNGN damjanek@cocaine.local
@@ -62,3 +73,5 @@
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDV6H07IEV9merlHUFV8O/Y7sczYXNZjysTBg4TkUW3mWzvW0PJMKnP6Fc1XfFE53fR71N09gkmnVlEtbHa8PTXoS89JVuUHTnitAbDdINShm0pFNWsi/3f00nbfQ8hjaxEWeZ4VlwYzP4v5IPVtpDug+epK65clIG8Xfxlp+CcckyeDdBNSztHHDuQiholzmPicN6EFM6bVUqUZSGnmxiOCrYUOMXBbYChBc3otfeF6vO3WvnKF77nixgOGGmuS0+t96vPKLB3cl5GYpTFyOmrt3tu7JPlTsqwUa0yqDa3ny+5BToIpnROhAqTZV5fV3LHgtObcWYRGANdjVWyPiNOiywiDzsw7/xzuuqV2wLeLnFG1Z+G550F1Ed4lrsPYKc7+qxZYLquI0iJoIjg5WPzNw5QBLdb1srL9zo+0A91Asx8U95IjIMWumowWjDN3Mn0qJwxW5d8SUign3wksIu2FlkLCT4u95CEIebDVEhTQQR0AOP00/KLKtBDn9a5H0UnJZZSTG4+prU3CnqyXqyp6dano86fGEkkcP2PDi/SUwoxdBvMVbdZxYpPYm+8Oe0TjLWPlwu4kYCwVnl3EYgJZAHjT6wVHOjyXcJYezPvvXY8B/VR8UfupetHg5/mVjoQQy2+Nl34AaDN2TLQLXRuG+U+hZqV5Jzc3JO+KKfDUw== mwilson@mwilson-ThinkPad-W530
     korlowska:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqsNuEIZr8XobFca4uN3KDAQzyd//NaZQrEMfJZNm8Gj5ym4NWX8cUjf3TQvV6eMGsNe/mxwIxmpyIANQeWUUlnelXG4rRjkBt94J1bg1YeB6F76R6yPuMrP8x/4s5nTy1OVr7jo1xwwL9aHZZcxQFExMBRMM2HrZDJNoXSdwqi7vuW8uUkCSwd8lsZ4iftI4TIafehZTHWroPP3kVMI+JvbdKyAR8xT2DsPHCIb42lEfCPMEYopKRI///L3KkZkbaVdshz/4zCvx3fAyKCHLH44Qgjs3eoAuz1ZFjAec/j6jwNEWGIrlk0g5nIfEXHR5e6qZRwa+nW60xHpIwMfGWtHscyTXR95OVXlEMLqAmycSXVLwyu47attnE/CLLUH4am38ET6w8Oxkzis0gHs3NOEhoNAf2OVhV3gP3aPzoDBRGemNdYZgGNnq6VI9dNhItkxN1QIYKI1d1Dwt8sz1PJM0W9JJjZDNFZAh5Q5QAsg3nxNudk4bxyjCnYbYbRj/dbKOKLJTEsqelsvlKT/+picEwqB/xmcwalHoKtR9QsNw2XuENBQk3OCfAC4SOhm+U1zq7XHpoVxjjn/J4p5ChkH7bhNGNMAE9aefekXGWNjpQFRszd/0SlEkzhUDsUIGKFEP8wlsjb9eOzatYf65fRbE1/YGODuwubj7WrZxy3w== korlowska@mirantis.com
+    sflorczak:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOdCr32ewiGJKLLwxf0Ic0naFV1j+ZflpfUVjuIPplrLeL5u8CNVlT5adPzgc48ijbee3qpzNvkOC7Ym295xQXUluo/cj2p5wVp70YnHrfhnLjGOCldm/K8B9bHmHbm1XW6hWUp7SWjMwhOdR217iveVLkuOy+hPdpXOC86hO93v7fY12UZDiqSRfrHpUqEaHHqlSyU2Eftn9GsR4UaotkeaQsiv8bi/k5nrwea/ccALZXnhrgTSTpXOVy3rfR5cCFQCA1PjMYvFEjhUofCHBSk+OA8xwOkpBOCfYrWRUmMT7MGEV5Jjm75QUrq1AuqRdFh8SM5lP39Tdwr8FMC+q5 flor3k@MacBook-Pro-Szymon.local
diff --git a/salt/master/formula/git/kubernetes.yml b/salt/master/formula/git/kubernetes.yml
index c827caf..fe8ad5d 100644
--- a/salt/master/formula/git/kubernetes.yml
+++ b/salt/master/formula/git/kubernetes.yml
@@ -6,17 +6,17 @@
           formula:
             kubernetes:
               source: git
-              address: 'https://github.com/openstack/salt-formula-kubernetes.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-kubernetes.git'
               revision: ${_param:salt_master_environment_revision}
             etcd:
               source: git
-              address: 'https://github.com/tcpcloud/salt-formula-etcd.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-etcd.git'
               revision: ${_param:salt_master_environment_revision}
             bird:
               source: git
-              address: 'https://github.com/tcpcloud/salt-formula-bird.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-bird.git'
               revision: ${_param:salt_master_environment_revision}
             docker:
               source: git
-              address: 'https://github.com/tcpcloud/salt-formula-docker.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-docker.git'
               revision: ${_param:salt_master_environment_revision}
\ No newline at end of file
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index c6cf269..78b7d91 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -6,19 +6,23 @@
           formula:
             aodh:
               source: git
-              address: 'https://github.com/tcpcloud/salt-formula-aodh.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-aodh.git'
               revision: ${_param:salt_master_environment_revision}
             billometer:
               source: git
-              address: 'https://github.com/tcpcloud/salt-formula-billometer.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git'
               revision: ${_param:salt_master_environment_revision}
             ceilometer:
               source: git
-              address: 'https://github.com/openstack/salt-formula-ceilometer.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-ceilometer.git'
+              revision: ${_param:salt_master_environment_revision}
+            ceph:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-ceph.git'
               revision: ${_param:salt_master_environment_revision}
             cinder:
               source: git
-              address: 'https://github.com/openstack/salt-formula-cinder.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-cinder.git'
               revision: ${_param:salt_master_environment_revision}
             galera:
               source: git
@@ -26,11 +30,11 @@
               revision: ${_param:salt_master_environment_revision}
             glance:
               source: git
-              address: 'https://github.com/openstack/salt-formula-glance.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-glance.git'
               revision: ${_param:salt_master_environment_revision}
             glusterfs:
               source: git
-              address: 'https://github.com/tcpcloud/salt-formula-glusterfs.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-glusterfs.git'
               revision: ${_param:salt_master_environment_revision}
             haproxy:
               source: git
@@ -38,11 +42,11 @@
               revision: ${_param:salt_master_environment_revision}
             heat:
               source: git
-              address: 'https://github.com/openstack/salt-formula-heat.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-heat.git'
               revision: ${_param:salt_master_environment_revision}
             horizon:
               source: git
-              address: 'https://github.com/openstack/salt-formula-horizon.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-horizon.git'
               revision: ${_param:salt_master_environment_revision}
             keepalived:
               source: git
@@ -50,7 +54,7 @@
               revision: ${_param:salt_master_environment_revision}
             keystone:
               source: git
-              address: 'https://github.com/openstack/salt-formula-keystone.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-keystone.git'
               revision: ${_param:salt_master_environment_revision}
             memcached:
               source: git
@@ -70,7 +74,7 @@
               revision: ${_param:salt_master_environment_revision}
             neutron:
               source: git
-              address: 'https://github.com/openstack/salt-formula-neutron.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-neutron.git'
               revision: ${_param:salt_master_environment_revision}
             nginx:
               source: git
@@ -78,11 +82,11 @@
               revision: ${_param:salt_master_environment_revision}
             nova:
               source: git
-              address: 'https://github.com/openstack/salt-formula-nova.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-nova.git'
               revision: ${_param:salt_master_environment_revision}
             opencontrail:
               source: git
-              address: 'https://github.com/openstack/salt-formula-opencontrail.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git'
               revision: ${_param:salt_master_environment_revision}
             python:
               source: git
@@ -102,5 +106,5 @@
               revision: ${_param:salt_master_environment_revision}
             swift:
               source: git
-              address: 'https://github.com/openstack/salt-formula-swift.git'
+              address: '${_param:salt_master_environment_repository}/salt-formula-swift.git'
               revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index dd8841f..6d9bcab 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -13,6 +13,9 @@
             ceilometer:
               source: pkg
               name: salt-formula-ceilometer
+            ceph:
+              source: pkg
+              name: salt-formula-ceph
             cinder:
               source: pkg
               name: salt-formula-cinder