diff --git a/releasenotes/notes/deprecate-repo-apt-packages-f8c4a22fc60828bf.yaml b/releasenotes/notes/deprecate-repo-apt-packages-f8c4a22fc60828bf.yaml
index 50c0a29..7976f91 100644
--- a/releasenotes/notes/deprecate-repo-apt-packages-f8c4a22fc60828bf.yaml
+++ b/releasenotes/notes/deprecate-repo-apt-packages-f8c4a22fc60828bf.yaml
@@ -1,5 +1,5 @@
 ---
-deprecations:
-  - The ``repo_apt_packages`` variable has been deprecated.
-    ``repo_server_packages`` should be used instead to override
-    packages required to install a repo server.
+upgrade:
+  - The variable ``repo_server_packages`` that defines the list of packages
+    required to install a repo server has been replaced
+    by ``repo_server_distro_packages``.
diff --git a/tasks/install_apt.yml b/tasks/install_apt.yml
index b2dcdd7..de20c8a 100644
--- a/tasks/install_apt.yml
+++ b/tasks/install_apt.yml
@@ -38,6 +38,6 @@
   until: install_packages|success
   retries: 5
   delay: 5
-  with_items: "{{ repo_server_packages | deprecated(repo_apt_packages, 'repo_apt_packages', 'repo_server_packages', 'Ocata') }}"
+  with_items: "{{ repo_server_distro_packages }}"
   tags:
     - repo-packages
diff --git a/tasks/install_yum.yml b/tasks/install_yum.yml
index 421cbeb..ee7c288 100644
--- a/tasks/install_yum.yml
+++ b/tasks/install_yum.yml
@@ -21,6 +21,6 @@
   until: install_packages|success
   retries: 5
   delay: 5
-  with_items: "{{ repo_server_packages }}"
+  with_items: "{{ repo_server_distro_packages }}"
   tags:
     - repo-packages
diff --git a/tasks/repo_cacher.yml b/tasks/repo_cacher.yml
index 93d3ed6..23e9e1d 100644
--- a/tasks/repo_cacher.yml
+++ b/tasks/repo_cacher.yml
@@ -22,7 +22,7 @@
   until: install_packages|success
   retries: 5
   delay: 5
-  with_items: "{{ repo_pkg_cache_server_packages }}"
+  with_items: "{{ repo_pkg_cache_server_distro_packages }}"
   when:
     - ansible_pkg_mgr == 'yum'
     - repo_pkg_cache_enabled | bool
@@ -35,7 +35,7 @@
   until: install_packages|success
   retries: 5
   delay: 5
-  with_items: "{{ repo_pkg_cache_server_packages }}"
+  with_items: "{{ repo_pkg_cache_server_distro_packages }}"
   when:
     - ansible_pkg_mgr == 'apt'
     - repo_pkg_cache_enabled | bool
diff --git a/vars/debian.yml b/vars/debian.yml
index d1d10fe..ef78ebe 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -18,11 +18,11 @@ repo_nginx_pid: /var/run/nginx.pid
 git_daemon_path: /usr/lib/git-core/git-daemon
 rsyncd_service_name: rsync
 
-repo_server_packages:
+repo_server_distro_packages:
   - git
   - lsyncd
   - nginx-extras
   - rsync
 
-repo_pkg_cache_server_packages:
+repo_pkg_cache_server_distro_packages:
   - apt-cacher-ng
diff --git a/vars/redhat.yml b/vars/redhat.yml
index fe5c6ec..8546089 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -18,12 +18,12 @@ repo_nginx_pid: /run/nginx.pid
 git_daemon_path: /usr/libexec/git-core/git-daemon
 rsyncd_service_name: rsyncd
 
-repo_server_packages:
+repo_server_distro_packages:
   - git-daemon
   - lsyncd
   - nginx
   - rsync
 
-repo_pkg_cache_server_packages:
+repo_pkg_cache_server_distro_packages:
   - apt-cacher-ng