diff --git a/roles/ensure-docker/tasks/docker-upstream.yaml b/roles/ensure-docker/tasks/docker-upstream.yaml
index f7420521e..c2b932ba2 100644
--- a/roles/ensure-docker/tasks/docker-upstream.yaml
+++ b/roles/ensure-docker/tasks/docker-upstream.yaml
@@ -18,18 +18,6 @@
         repositories_keys: "{{ _docker_keys }}"
         repositories_list: "{{ _docker_repos }}"
 
-    # Workaround for docker-ce installation failure due conflict with containerd.io
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1756473#c1
-    - name: Patch docker-ce.repo for newer RedHat distros
-      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8'
-      ini_file:
-        path: /etc/yum.repos.d/docker-ce.repo
-        section: docker-ce-stable
-        option: module_hotfixes
-        value: "True"
-        no_extra_spaces: true
-        create: false
-
     - name: Install pre-reqs
       package:
         name: "{{ _docker_upstream_distro_required_packages }}"
diff --git a/roles/ensure-docker/vars/redhat.yaml b/roles/ensure-docker/vars/redhat.yaml
index e8b54533f..3ddf14d83 100644
--- a/roles/ensure-docker/vars/redhat.yaml
+++ b/roles/ensure-docker/vars/redhat.yaml
@@ -38,7 +38,7 @@ _docker_repos:
   - name: docker-ce-stable
     file: docker-ce
     description: Docker CE Stable - $basearch
-    baseurl: "{{ docker_mirror_base_url }}/7/$basearch/stable"
+    baseurl: "{{ docker_mirror_base_url }}/$releasever/$basearch/stable"
     gpgcheck: yes
 
 _docker_distro_packages: