diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index bbf24e399..0291ed4a5 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -7,7 +7,7 @@ kiwix_src_file_i686: "kiwix-0.10-linux-i686.tar.bz2"   # Published Oct 2016 ("ex
 
 kiwix_port: 3000
 # Expected to be used soon for Kiwix proxy:
-kiwix_url: /kiwix
+kiwix_url: /kiwix/
 # Unused in Nov 2017, but should be:
 kiwix_path: "{{ iiab_base }}/kiwix"
 
diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index e618ddc25..05b0d7602 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -95,7 +95,7 @@
 
 # 4. CREATE/ENABLE/DISABLE KIWIX SERVICE & ITS CRON JOB
 
-- name: Create 'kiwix-serve' service
+- name: Create 'kiwix-serve' service and related files
   template:
     backup: no
     src: "{{ item.src }}"
@@ -108,7 +108,14 @@
 #   - { src: 'kiwix-serve-init.j2', dest: '/usr/libexec/kiwix-serve-init', mode: '0755'}
   - { src: 'iiab-make-kiwix-lib', dest: '/usr/bin/iiab-make-kiwix-lib', mode: '0755'}
   - { src: 'iiab-make-kiwix-lib.py', dest: '/usr/bin/iiab-make-kiwix-lib.py', mode: '0755'}
-  - { src: 'iiab-make-apache-config.py', dest: '/usr/bin/iiab-make-apache-config.py', mode: '0755'}
+#  - { src: 'iiab-make-apache-config.py', dest: '/usr/bin/iiab-make-apache-config.py', mode: '0755'}
+  - { src: 'kiwix.conf.j2', dest: '/etc/{{ apache_config_dir }}/kiwix.conf', mode: '0644'}
+
+- name: Enable Kiwix Proxy in Apache - is disabled by turning off kiwix service
+  file: path=/etc/apache2/sites-enabled/kiwix.conf
+        src=/etc/apache2/sites-available/kiwix.conf
+        state=link
+  when: is_debuntu
 
 - name: Enable 'kiwix-serve' service
   service:
diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib b/roles/kiwix/templates/iiab-make-kiwix-lib
index 11a4b1d2a..e7ab98197 100644
--- a/roles/kiwix/templates/iiab-make-kiwix-lib
+++ b/roles/kiwix/templates/iiab-make-kiwix-lib
@@ -2,7 +2,7 @@
 
 {{ systemctl_program }} stop kiwix-serve
 /usr/bin/iiab-make-kiwix-lib.py
-/usr/bin/iiab-make-apache-config.py
+#/usr/bin/iiab-make-apache-config.py
 {{ systemctl_program }} start kiwix-serve
 
 exit 0
diff --git a/roles/kiwix/templates/kiwix-serve.service.j2 b/roles/kiwix/templates/kiwix-serve.service.j2
index c4af3c797..d09bb062a 100644
--- a/roles/kiwix/templates/kiwix-serve.service.j2
+++ b/roles/kiwix/templates/kiwix-serve.service.j2
@@ -4,7 +4,7 @@ After=syslog.target network.target local-fs.target
 
 [Service]
 Type=forking
-ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }}
+ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }}
 
 [Install]
 WantedBy=multi-user.target