diff --git a/ch2-inventory/student-quanpt/01-ipOnly.yaml b/ch2-inventory/student-quanpt/01-ipOnly.yaml
new file mode 100644
index 0000000..be39e19
--- /dev/null
+++ b/ch2-inventory/student-quanpt/01-ipOnly.yaml
@@ -0,0 +1,6 @@
+all:
+ hosts: 
+        192.168.100.11:
+        192.168.100.12:
+        192.168.100.21:
+        192.168.100.22:
diff --git a/ch2-inventory/student-quanpt/02-nonFQDN.yaml b/ch2-inventory/student-quanpt/02-nonFQDN.yaml
new file mode 100644
index 0000000..46d5ee3
--- /dev/null
+++ b/ch2-inventory/student-quanpt/02-nonFQDN.yaml
@@ -0,0 +1,12 @@
+all:
+ hosts:
+         ubuntu11:
+                 ansible_host: 192.168.100.11
+         ubuntu12:
+                 ansible_host: 192.168.100.12
+         centos21:
+                 ansible_host: 192.168.100.21
+         centos22:
+                 ansible_host: 192.168.100.22
+         ubuntu-2:
+                 ansible_host: 192.168.94.242
diff --git a/ch2-inventory/student-quanpt/03-hostgroups-children-copy.yaml b/ch2-inventory/student-quanpt/03-hostgroups-children-copy.yaml
new file mode 100644
index 0000000..fd83e66
--- /dev/null
+++ b/ch2-inventory/student-quanpt/03-hostgroups-children-copy.yaml
@@ -0,0 +1,18 @@
+all:
+ hosts:
+  fakehost.local:
+ children:
+  linux:
+   children:
+    ubuntu:
+     hosts:
+      ubuntu11:
+       ansible_host: 192.168.100.11
+      ubuntu12:
+       ansible_host: 192.168.100.12
+    centos:
+     hosts:
+      centos21:
+       ansible_host: 192.168.100.21
+      centos22:
+       ansible_host: 192.168.100.22
diff --git a/ch3-playbook/07-install-apache-not-work.yaml b/ch3-playbook/07-install-apache-not-work.yaml
index 8a09eb2..67257af 100644
--- a/ch3-playbook/07-install-apache-not-work.yaml
+++ b/ch3-playbook/07-install-apache-not-work.yaml
@@ -6,12 +6,12 @@
 
   tasks:
     - name: Install Apache package
-      yum:
-        name: httpd
+      apt:
+        name: apache2
         state: latest
 
     - name: Restart and enable the service
-      service:
-        name: httpd
+      systemd:
+        name: apache2
         state: restarted
-        enabled: yes
\ No newline at end of file
+        enabled: yes
diff --git a/ch3-playbook/08-quanpt-apache-helloworld.yaml b/ch3-playbook/08-quanpt-apache-helloworld.yaml
new file mode 100644
index 0000000..65825a9
--- /dev/null
+++ b/ch3-playbook/08-quanpt-apache-helloworld.yaml
@@ -0,0 +1,25 @@
+# Playbook for automated apache installation
+---
+- name: The demo playbook
+  hosts: all
+  gather_facts: yes
+  become: yes
+  vars:
+    my_name: 'QuanPT'
+
+  tasks:
+    - name: Install Apache package
+      apt:
+        name: apache2
+        state: latest
+
+    - name: template index.html
+      template:
+        src: ./files/index.html
+        dest: /var/www/html/
+        mode: 0755
+    - name: Restart and enable the service
+      systemd:
+        name: apache2
+        state: restarted
+        enabled: yes
diff --git a/ch3-playbook/files/index.html b/ch3-playbook/files/index.html
new file mode 100644
index 0000000..427385a
--- /dev/null
+++ b/ch3-playbook/files/index.html
@@ -0,0 +1 @@
+{{my_name}}
diff --git a/ch3-playbook/inventory/hosts b/ch3-playbook/inventory/hosts
index e02db0e..8ee972c 100644
--- a/ch3-playbook/inventory/hosts
+++ b/ch3-playbook/inventory/hosts
@@ -1,13 +1,13 @@
 [ubuntu]
-ubuntu11 ansible_host=192.168.100.11
-ubuntu12 ansible_host=192.168.100.12
+ubuntu-2 ansible_host=192.168.94.242
+ubuntu-3 ansible_host=192.168.94.243
 
-[centos]
-centos21 ansible_host=192.168.100.21
-centos22 ansible_host=192.168.100.22
+#[centos]
+#centos21 ansible_host=192.168.100.21
+#centos22 ansible_host=192.168.100.22
 
 
-[linux:children]
-ubuntu
-centos
+#[linux:children]
+#ubuntu
+#centos
 
diff --git a/ch4-role/quanpt/ansible.cfg b/ch4-role/quanpt/ansible.cfg
new file mode 100644
index 0000000..8e4c637
--- /dev/null
+++ b/ch4-role/quanpt/ansible.cfg
@@ -0,0 +1,3 @@
+[defaults]
+host_key_checking = False
+inventory = inventory
diff --git a/ch4-role/quanpt/inventory/group_vars/all/vars b/ch4-role/quanpt/inventory/group_vars/all/vars
new file mode 100755
index 0000000..e7d518d
--- /dev/null
+++ b/ch4-role/quanpt/inventory/group_vars/all/vars
@@ -0,0 +1,2 @@
+ansible_user: ansible
+ansible_password: "{{ vault_ansible_password }}"
diff --git a/ch4-role/quanpt/inventory/group_vars/all/vault b/ch4-role/quanpt/inventory/group_vars/all/vault
new file mode 100755
index 0000000..737a522
--- /dev/null
+++ b/ch4-role/quanpt/inventory/group_vars/all/vault
@@ -0,0 +1,6 @@
+$ANSIBLE_VAULT;1.1;AES256
+32336532376564386130326661343063333632356235646166383131366263643933343339353333
+3737393662333964336564346163643932336532396433380a323561663664323038303639363866
+38663862333731396635613561636662366561356531616237306237363162656664643835626436
+3137386439373335640a333461373339663230646563633961343466636533393662393235336233
+61393034633637616437303938643339663134656538383434343561396339333639
diff --git a/ch4-role/quanpt/inventory/group_vars/centos.yaml b/ch4-role/quanpt/inventory/group_vars/centos.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/ch4-role/quanpt/inventory/group_vars/ubuntu.yaml b/ch4-role/quanpt/inventory/group_vars/ubuntu.yaml
new file mode 100644
index 0000000..f1a3ed4
--- /dev/null
+++ b/ch4-role/quanpt/inventory/group_vars/ubuntu.yaml
@@ -0,0 +1 @@
+ansible_python_interpreter: /usr/bin/python3
diff --git a/ch4-role/quanpt/inventory/hosts b/ch4-role/quanpt/inventory/hosts
new file mode 100644
index 0000000..140b665
--- /dev/null
+++ b/ch4-role/quanpt/inventory/hosts
@@ -0,0 +1,13 @@
+[ubuntu]
+ubuntu-2 ansible_host=192.168.94.242
+#ubuntu-3 ansible_host=192.168.94.243
+
+#[centos]
+#centos21 ansible_host=192.168.100.21
+#centos22 ansible_host=192.168.100.22
+
+
+#[linux:children]
+#ubuntu
+#centos
+
diff --git a/ch4-role/quanpt/roles/apache2/.travis.yml b/ch4-role/quanpt/roles/apache2/.travis.yml
new file mode 100644
index 0000000..36bbf62
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/.travis.yml
@@ -0,0 +1,29 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' >ansible.cfg
+
+script:
+  # Basic role syntax check
+  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/ch4-role/quanpt/roles/apache2/README.md b/ch4-role/quanpt/roles/apache2/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/ch4-role/quanpt/roles/apache2/defaults/main.yml b/ch4-role/quanpt/roles/apache2/defaults/main.yml
new file mode 100644
index 0000000..1501c55
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+# defaults file for apache2
+#user: ansible
+#password: "{{ ansible_password }}"
+packages:
+ Debian: apache2
+ Redhat: httpd
+
diff --git a/ch4-role/quanpt/roles/apache2/handlers/main.yml b/ch4-role/quanpt/roles/apache2/handlers/main.yml
new file mode 100644
index 0000000..9b574ca
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+# handlers file for apache2
+- name: Restart Apache
+  service:
+    name: "{{ packages[ansible_os_family] }}"
+    state: restarted
diff --git a/ch4-role/quanpt/roles/apache2/meta/main.yml b/ch4-role/quanpt/roles/apache2/meta/main.yml
new file mode 100644
index 0000000..f5f7011
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/meta/main.yml
@@ -0,0 +1,49 @@
+galaxy_info:
+  author: Pham Quan
+  description: First Roles
+  company: My Name
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.9
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  platforms:
+  - name: EL
+    versions:
+    - "7"
+  - name: Ubuntu
+    versions:
+    - "bionic"
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
+  
diff --git a/ch4-role/quanpt/roles/apache2/tasks/main.yml b/ch4-role/quanpt/roles/apache2/tasks/main.yml
new file mode 100644
index 0000000..343c510
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/tasks/main.yml
@@ -0,0 +1,19 @@
+---
+# tasks file for apache2
+#
+- name: Install apache
+  package:
+    name: "{{ packages[ansible_os_family] }}"
+    state: present
+
+- name: Config service
+  service:
+    name: "{{ packages[ansible_os_family] }}"
+    state: restarted
+    enabled: yes
+
+- name: Template index.html
+  notify: Restart Apache
+  template:
+    src: "templates/index.html"
+    dest: "/var/www/html/index.html"
diff --git a/ch4-role/quanpt/roles/apache2/templates/index.html b/ch4-role/quanpt/roles/apache2/templates/index.html
new file mode 100644
index 0000000..11725fe
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/templates/index.html
@@ -0,0 +1 @@
+My name: {{ansible_user}} -  password: {{vault_ansible_password}}
diff --git a/ch4-role/quanpt/roles/apache2/tests/inventory b/ch4-role/quanpt/roles/apache2/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/ch4-role/quanpt/roles/apache2/tests/test.yml b/ch4-role/quanpt/roles/apache2/tests/test.yml
new file mode 100644
index 0000000..716bb73
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - apache2
\ No newline at end of file
diff --git a/ch4-role/quanpt/roles/apache2/vars/main.yml b/ch4-role/quanpt/roles/apache2/vars/main.yml
new file mode 100644
index 0000000..5d23ceb
--- /dev/null
+++ b/ch4-role/quanpt/roles/apache2/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for apache2
diff --git a/ch4-role/quanpt/site.yml b/ch4-role/quanpt/site.yml
new file mode 100644
index 0000000..f2a8d0d
--- /dev/null
+++ b/ch4-role/quanpt/site.yml
@@ -0,0 +1,36 @@
+- name: Setup Apache 
+  hosts: all
+  gather_facts: yes
+  become: yes
+  vars_prompt:
+  - name: choose
+    prompt: Enter '1' to install or '2 ' to uninstall. '1' is default
+    default: "1"
+    private: no
+  tasks:
+  - block: 
+    - debug:
+       msg: "You choose Install Apache2"    
+    - name: Install Apache
+      import_role:
+        name: apache2
+      when: choose == "1"
+    - name: test apache
+      shell: curl {{ansible_hostname}}
+      delegate_to: 127.0.0.1
+      register: out
+    - debug:
+       msg: "{{ out.stdout }}"
+    when: choose == "1"
+  - block:
+    - debug:
+       msg: "You choose Uninstall Apache2"
+    - name: Stop service
+      systemd:
+       name: "{{ packages[ansible_os_family] }}"
+       state: stopped
+    - name: Uninstall Apache
+      package:
+       name: "{{ packages[ansible_os_family] }}"
+       state: absent
+    when: choose == "2"