diff --git a/releasenotes/notes/make-sure-the-repo-is-removed-if-not-used-36670d0a276192f1.yaml b/releasenotes/notes/make-sure-the-repo-is-removed-if-not-used-36670d0a276192f1.yaml
new file mode 100644
index 00000000..28cb5155
--- /dev/null
+++ b/releasenotes/notes/make-sure-the-repo-is-removed-if-not-used-36670d0a276192f1.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - The percona repository stayed in placed even after
+    a change of the variable ``use_percona_upstream``.
+    From now on, the percona repository will not be
+    present unless the deployer decides to
+    ``use_percona_upstream``. This also fixes a bug
+    of the presence of this apt repository after an
+    upgdrade from Mitaka.
diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml
index 53cd7e16..aa275bcc 100644
--- a/tasks/galera_install_apt.yml
+++ b/tasks/galera_install_apt.yml
@@ -86,12 +86,11 @@
   apt_repository:
     repo: "{{ galera_percona_xtrabackup_repo.repo }}"
     filename: "{{ galera_percona_xtrabackup_repo.filename }}"
-    state: "{{ galera_percona_xtrabackup_repo.state }}"
+    state: "{{ use_percona_upstream | bool | ternary('present','absent') }}"
   register: add_repos
   until: add_repos|success
   retries: 5
   delay: 2
-  when: use_percona_upstream | bool
   tags:
     - percona-repos