diff --git a/defaults/main.yml b/defaults/main.yml
index 2bcb620..8a2392d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,6 +12,7 @@ docker_restart_handler_state: restarted
 # Docker Compose options.
 docker_install_compose: true
 docker_compose_version: "1.22.0"
+docker_compose_download_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
 docker_compose_path: /usr/local/bin/docker-compose
 
 # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
diff --git a/tasks/docker-compose.yml b/tasks/docker-compose.yml
index 92cf4f2..f23c30a 100644
--- a/tasks/docker-compose.yml
+++ b/tasks/docker-compose.yml
@@ -15,6 +15,6 @@
 
 - name: Install Docker Compose (if configured).
   get_url:
-    url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64
+    url: "{{ docker_compose_download_url }}"
     dest: "{{ docker_compose_path }}"
     mode: 0755
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index eaaa96f..8c6ecc6 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -20,6 +20,8 @@
     state: present
   register: add_repository_key
   ignore_errors: "{{ docker_apt_ignore_key_error }}"
+  tags:
+  - configure_docker_repo
 
 - name: Ensure curl is present (on older systems without SNI).
   package: name=curl state=present
@@ -32,9 +34,13 @@
   args:
     warn: false
   when: add_repository_key is failed
+  tags:
+  - configure_docker_repo
 
 - name: Add Docker repository.
   apt_repository:
     repo: "{{ docker_apt_repository }}"
     state: present
     update_cache: true
+  tags:
+  - configure_docker_repo
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index 0cd1a50..452c737 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -11,6 +11,8 @@
   rpm_key:
     key: https://download.docker.com/linux/centos/gpg
     state: present
+  tags:
+  - configure_docker_repo
 
 - name: Add Docker repository.
   get_url:
@@ -19,6 +21,8 @@
     owner: root
     group: root
     mode: 0644
+  tags:
+  - configure_docker_repo
 
 - name: Configure Docker Edge repo.
   ini_file:
@@ -26,6 +30,8 @@
     section: 'docker-{{ docker_edition }}-edge'
     option: enabled
     value: '{{ docker_yum_repo_enable_edge }}'
+  tags:
+  - configure_docker_repo
 
 - name: Configure Docker Test repo.
   ini_file:
@@ -33,3 +39,5 @@
     section: 'docker-{{ docker_edition }}-test'
     option: enabled
     value: '{{ docker_yum_repo_enable_test }}'
+  tags:
+  - configure_docker_repo