diff --git a/defaults/main.yml b/defaults/main.yml
index b719a0dc7881ea449fae88f4623c9609367253ce..5fdceee395b4cc14dd032fb44f0d02c4cb9782d5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,7 +27,3 @@ tinyproxy_filtering:
     extended: "On"
     default_deny: "On"
     case_sensitive: "Off"
-
-epel_repo_url: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
-epel_repo_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"
-epel_repofile_path: "/etc/yum.repos.d/epel.repo"
diff --git a/handlers/main.yml b/handlers/main.yml
index 5f9055006bb093a3628805f00423fa489311ae61..32bee263edb440be2ba8e0c353bbdaaca6916857 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,5 @@
 ---
 - name: restart tinyproxy
-  become: "yes"
   service:
     name: tinyproxy
     state: restarted
diff --git a/meta/main.yml b/meta/main.yml
index a563724c4fb0cc22aeb945474e68825a01d23c05..ea22b375a16cc1771fb4aef4aca69d2c839ca16b 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -9,7 +9,5 @@ galaxy_info:
     - name: CentOS
       versions:
         - 7
-dependencies: []
-# List your role dependencies here, one per line.
-# Be sure to remove the '[]' above if you add dependencies
-# to this list.
+dependencies:
+  - ics-ans-role-repository
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
new file mode 100644
index 0000000000000000000000000000000000000000..104566f7c7fcc949095286ff0ce4b328ec7b59b8
--- /dev/null
+++ b/molecule/default/requirements.yml
@@ -0,0 +1 @@
+- src: git+https://gitlab.esss.lu.se/ics-ansible-galaxy/ics-ans-role-repository.git
diff --git a/tasks/main.yml b/tasks/main.yml
index 14698030cffa7660a7347729f55ebc00b73afd3d..f9bf624b7ab2f285c6157aae3d9152fa0a5fc413 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,70 +1,30 @@
 ---
-- name: Check if EPEL repo is already configured.
-  stat:
-    path: "{{ epel_repofile_path }}"
-  register: epel_repofile_result
-
-- name: Install EPEL repo.
-  yum:
-    name: "{{ epel_repo_url }}"
-    state: present
-  register: result
-  when: not epel_repofile_result.stat.exists
-
-- name: Import EPEL GPG key.
-  rpm_key:
-    key: "{{ epel_repo_gpg_key_url }}"
-    state: present
-  when: not epel_repofile_result.stat.exists
-
 - name: Install tinyproxy
-  become: "yes"
   yum:
     name: tinyproxy
     state: present
 
 - name: Copy 400 error html files
-  become: "yes"
-  template:
-    src: ../templates/400.html
-    dest: /usr/share/tinyproxy/400.html
-
-- name: Copy 403 error html files
-  become: "yes"
   template:
-    src: ../templates/403.html
-    dest: /usr/share/tinyproxy/403.html
-
-- name: Copy 404 error html files
-  become: "yes"
-  template:
-    src: ../templates/404.html
-    dest: /usr/share/tinyproxy/404.html
-
-- name: Copy 503 error html files
-  become: "yes"
-  template:
-    src: ../templates/503.html
-    dest: /usr/share/tinyproxy/503.html
+    src: "{{ item }}"
+    dest: "/usr/share/tinyproxy/{{ item }}"
+  with_items:
+    - 400.html
+    - 403.html
+    - 404.html
+    - 503.html
 
 - name: Create url filter file for tinyproxy
-  become: "yes"
-  template:
-    src: ../templates/filter.j2
-    dest: /etc/tinyproxy/filter
-  notify:
-    - restart tinyproxy
-
-- name: Setup configuration file for tinyproxy
-  become: "yes"
   template:
-    src: ../templates/tinyproxy.conf.j2
-    dest: /etc/tinyproxy/tinyproxy.conf
+    src: "{{ item }}"
+    dest: "/etc/tinyproxy/{{ item }}"
+  with_items:
+    - filter
+    - tinyproxy.conf
   notify:
     - restart tinyproxy
 
 - name: Test that tinyproxy is up
-  become: "yes"
   service:
     enabled: "yes"
     name: tinyproxy
diff --git a/templates/filter.j2 b/templates/filter
similarity index 100%
rename from templates/filter.j2
rename to templates/filter
diff --git a/templates/tinyproxy.conf.j2 b/templates/tinyproxy.conf
similarity index 100%
rename from templates/tinyproxy.conf.j2
rename to templates/tinyproxy.conf