diff --git a/tasks/install_apt.yml b/tasks/install_apt.yml
index f355975a..c75da5f5 100644
--- a/tasks/install_apt.yml
+++ b/tasks/install_apt.yml
@@ -69,6 +69,8 @@
     filename: "{{ rabbitmq_erlang_repo.filename | default(omit) }}"
     update_cache: no
   register: add_erlang_repos
+  when:
+    - rabbitmq_erlang_repo.repo is defined
   tags:
     - rabbitmq-repos
 
diff --git a/vars/debian-11.yml b/vars/debian-11.yml
new file mode 100644
index 00000000..37a54f4e
--- /dev/null
+++ b/vars/debian-11.yml
@@ -0,0 +1,31 @@
+---
+# Copyright 2021. BBC R&D
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+_rabbitmq_install_method: distro
+_rabbitmq_package_version: "3.8.9-3"
+
+_rabbitmq_erlang_version_spec: "23.2.6+dfsg-1"
+
+_rabbitmq_gpg_keys: []
+
+rabbitmq_dependencies:
+  - "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('erlang-base', 'erlang-base-hipe') }}"
+  - erlang-diameter
+  - erlang-eldap
+  - erlang-nox
+  - socat
+
+rabbitmq_distro_packages:
+  - rabbitmq-server