diff --git a/installations/monetization/configuration/opdk-setup-os.yml b/installations/monetization/configuration/opdk-setup-os.yml
new file mode 100644
index 0000000..5b148a7
--- /dev/null
+++ b/installations/monetization/configuration/opdk-setup-os.yml
@@ -0,0 +1,15 @@
+---
+- hosts: '{{ hosts }}'
+  become: yes
+  gather_facts: no
+  strategy: free
+  pre_tasks:
+  - name: Load credentials from encrypted file
+    include_vars: '~/.apigee/credentials.yml'
+  roles:
+  - opdk-setup-os-minimum
+  - opdk-setup-selinux-disable
+  - opdk-shutdown-iptables
+  - opdk-time-sync
+  - opdk-setup-os-common
+
diff --git a/installations/monetization/configuration/update-user.yml b/installations/monetization/configuration/update-user.yml
new file mode 100644
index 0000000..dc29f0a
--- /dev/null
+++ b/installations/monetization/configuration/update-user.yml
@@ -0,0 +1,42 @@
+---
+- hosts: '{{ hosts }}'
+  become: yes
+#  gather_facts: no
+
+  vars:
+    pubkey: '~/.ssh/id_rsa.pub'
+
+  tasks:
+#  - name: Wait for port 22
+#    wait_for:
+#      port: 22
+#      timeout: 300
+#      delay: '{{ delay_before_check }}'
+
+  - name: Build EC2 facts cache
+    ec2_facts:
+
+  - name: Build setup facts cache
+    setup:
+
+  - name: Copy local public keys to server for user {{ user }}
+    authorized_key:
+      user: '{{ user }}'
+      state: present
+      key: "{{ lookup('file', '{{ pubkey }}') }}"
+
+  - name: Permit root login over SSH
+    lineinfile:
+      state: present
+      dest: /etc/ssh/sshd_config
+      regexp: '(^#)(PermitRootLogin yes)'
+      line: '\2'
+      backrefs: yes
+    notify:
+    - Restart SSH service
+
+  handlers:
+  - name: Restart SSH service
+    service:
+      name: sshd
+      state: restarted
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index bbba673..a2ecd99 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -10,61 +10,15 @@
 
 - include: components/opdk-install-component.yml
   vars:
-    hosts: 'dc-1-ds'
-    component_profile: 'ds'
-  tags:
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
     hosts: 'dc-1-ms'
-    component_profile: 'ms'
+    component_profile: 'mo'
+    opdk_monetization: true
   tags:
-  - ms
+  - mo-ms
 
 - include: components/opdk-install-component.yml
   vars:
     hosts: 'dc-1-rmp'
-    component_profile: 'rmp'
-  tags:
-  - rmp
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-qpid'
-    component_profile: 'qs'
-  tags:
-  - qpid
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-1-pgmaster'
-    pg_component: 'master'
-  tags:
-  - pgmaster
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-1-pgstandby'
-    pg_component: 'standby'
-  tags:
-  - pgstandby
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: 'dc-1-ms'
-  tags:
-  - org-config
-
-- include: configuration/opdk-setup-org.yml
-  vars:
-    hosts: 'dc-1-ms'
-  tags:
-  - org
-
-- include: validations/opdk-setup-validate.yml
-  tags:
-  - validate
 
 - include: validations/opdk-setup-status.yml
   vars:
diff --git a/installations/monetization/validations/opdk-setup-log-files.yml b/installations/monetization/validations/opdk-setup-log-files.yml
new file mode 100644
index 0000000..21d31fa
--- /dev/null
+++ b/installations/monetization/validations/opdk-setup-log-files.yml
@@ -0,0 +1,25 @@
+---
+- hosts: planet
+  strategy: free
+  roles:
+  - { role: fetch-files, fetch_files: '{{ apigee_log_files }}' }
+  tags:
+  - logs
+  - apigee-logs
+
+- hosts: planet
+  become: true
+  strategy: free
+  roles:
+  - { role: fetch-files, fetch_files: '{{ system_config_files }}' }
+  tags:
+  - logs
+  - os-logs
+
+- hosts: planet
+  strategy: free
+  roles:
+  - { role: fetch-files, fetch_files: '{{ apigee_config_files }}' }
+  tags:
+  - logs
+  - config-logs
diff --git a/installations/monetization/validations/opdk-setup-status.yml b/installations/monetization/validations/opdk-setup-status.yml
new file mode 100644
index 0000000..7d2745d
--- /dev/null
+++ b/installations/monetization/validations/opdk-setup-status.yml
@@ -0,0 +1,6 @@
+---
+- hosts: '{{ hosts }}'
+  roles:
+  - opdk-setup-status
+  tags:
+  - status