diff --git a/files/gpg/0A9AF211 b/files/gpg/0A9AF211
new file mode 100644
index 00000000..8d719745
--- /dev/null
+++ b/files/gpg/0A9AF211
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+q67GbYw88+XcrM6R+Uk=
+=94II
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/files/gpg/4D206F89 b/files/gpg/4D206F89
deleted file mode 100644
index 6825e955..00000000
--- a/files/gpg/4D206F89
+++ /dev/null
@@ -1,65 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFu7jVkBEADBO7bMOw3KxZG5rJGpyZ/eUegI3qSvt1NtPqTp91oiCOAU4w3C
-PorCUnMQt/GMMZImlUSlvcd9aIfBaNFXSYWOiKNoKNsJSs790dpXeEScg82M8r+i
-VZUYh9lrwePtV9mU8jiVLwX0DzEfpuazPdAZY7UaKG/tJGErDYclNs+i7TcbQAca
-TT39uCM811L488OngXn2lepKUFgbEJ94dWDF8KuO8us0zP2ylTBGavDPo8m5DpaT
-ZU9t0Emwc8nsr+DAUA9E3/fY77jXITDJdhw3LK9CvLkXwlxLccMuZhaaj1L7izhZ
-1tH+kusFG0QVaZveG+MrIFPy9kgLIZ8/2HI83ZSjevu4h6Sq2qtl8hMWtPZuw8MN
-GrzgWRkuRxzZ0LMQG6uvXR1y/yy2eMcIthvyMAoUs1luuUqQKKzNkX+8FaSXikcb
-oRyjXUWLbE2MdWewsb+YO9i4dqO2KZcF4ryUIA85suHVqRYlRy1/HCB1jyMTGZC7
-LEnW+S8YRMiMifP2xTXduyrBQil4r8NqRT+G8GsE3p6RbVormIlwB3Kx6TIcPYP/
-ErOnL23TdMtYeIQnkctV67o6zxTz/9JNW1DL+YVbx2B4YOrDbiW+OvU74BKNU9lD
-zeBUdGa31SBL7nF9iEQ1FBVc+/HEbxKA7Zd/6tDBS+/iU+USbTrSgrN+RQARAQAB
-tHVodHRwczovL3BhY2thZ2VjbG91ZC5pby9yYWJiaXRtcS9yYWJiaXRtcS1zZXJ2
-ZXIgKGh0dHBzOi8vcGFja2FnZWNsb3VkLmlvL2RvY3MjZ3BnX3NpZ25pbmcpIDxz
-dXBwb3J0QHBhY2thZ2VjbG91ZC5pbz6JAjgEEwECACIFAlu7jVkCGy8GCwkIBwMC
-BhUIAgkKCwQWAgMBAh4BAheAAAoJEPTniSBNIG+JASgP/3Rc3A1OWDvbcAt1TRfT
-fHT7kniepAc76o/kBd2WJ5aT3wp634SWXS6+/fl8u/mz6FIYE14k6tmMlFW7i7IO
-8WY1BADBKUDvcbZ8eAVa5hx2wQesMrKrhnO/c+YRkqM4/008Pa2QkACzUDh4c0qD
-f/ZLD/BuBnfVDwGcYQbZwzKiCwRIxLXHyhD4KriQCdrDce/SlJhVoCnngIc+sEeY
-/R9VmORo3Lh5TRs5ivTZCB8eWXezudXTQq5oyXsu2gs4EyNsRnUD0bFx7aRsuFZS
-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
-PF1z
-=AD8w
------END PGP PUBLIC KEY BLOCK-----
diff --git a/files/gpg/A14F4FCA b/files/gpg/A14F4FCA
deleted file mode 100644
index 074efae5..00000000
--- a/files/gpg/A14F4FCA
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-ctmKvzuuerI6mVQjg/80PJ4fEV0=
-=VAR1
------END PGP PUBLIC KEY BLOCK-----
diff --git a/files/gpg/A16A4251 b/files/gpg/A16A4251
new file mode 100644
index 00000000..1f55003a
--- /dev/null
+++ b/files/gpg/A16A4251
@@ -0,0 +1,25 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQGNBGBJAVUBDADBhHZA6wqZcmWMALb5Q+H/99kuI1xXGSBTm3/sNU21kMzHL+Tm
+AJrZbSVHflkNdwjQM+xi2Z04xRYZlmE8VI9v788gKm3ojZ4l089aoMW85R0RLxnl
+My9KyUbpNkayOAVWIHj/AG/OMSrF7G3OcQCcDYLyD9PvIpt2vPgn9TunMkqD1G5o
+hMUOdBBBnzGrgWco2zbORwPM8O8ETtkcZioSp4AWCj7oA/SaugzBQ/3RzSby+1PT
+3cBRJei8RWGK97C9ILzY34SMYa0jj8x183gRRzGlGycyVQhLrHmhozLZFaqBCc5a
+0JtEYJy/yWeVvz+JEbx4VXFENQbWc77Qe9JO9iaPNO43HtOxpuxIOFajFHWnk2e7
+QSnYlZGZQ/7JRHtRu/GcCuqVf+M6jAVx+7rwjCdJ9ROhHYaCmXXODABUPwO0bWIr
+rnJChjSDnQ+aQJgQpcQfITO8FjvVcrQowjMCeIq58nIqq8aBKOEk7xHckQ6BnQSB
+KrHjzkM+6k8ccVMAEQEAAbRFQ2xvdWRzbWl0aCBQYWNrYWdlIChyYWJiaXRtcS9y
+YWJiaXRtcS1lcmxhbmcpIDxzdXBwb3J0QGNsb3Vkc21pdGguaW8+iQG3BBMBCAAh
+BQJgSQFVAhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEOSVu0nMS75bjV4L
+/1lbtAK4qtksPZRoZQJl+s9U7zj7Sqo7Gz9ke90sqt6O96QgKq0/LzACWoeezk9J
+lScTwl1bHg+/TVDdar5pTJf3jOoMxNqpdouF4uhCDhbJkOVYFDUysdYwCvavrF7U
+4zYa01jKuMcF1FJ21qqy9uFqfQsxVrvniIu1+tONbiDqPEVZUcd7ffcndCLBEpA2
+kbFrCj7nD/G3JrO3F6u3/v27lHbpaTbqiL5ovUj5nEA2ACzEgXP69+2MO/2h7mw1
+8kS48QiyTVaZaByN4RwbSmPDDtYXM7Mts59XPaxLrzWEH2wKtpAQdKSaUoTGSwDc
+bJJ/QOvTdHqaOSaEWR6tZnSrjdGElaHzK3xIdaTpipg+y6WKOEfM8WPpBmYrTJ2F
+KGO+mHZY0OdUqdCZohzNtZnbekZUb88UejEvtnOjxmO/22jZxIU7d8ocIV0l7GFf
+GMuKc63PqdMzaztmt+CS0uFscE4kfS3ZyMavW7pRDfB8Y4SqZ17zIdnIfnAucCus
+Tg==
+=gGzU
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/files/gpg/C072C960 b/files/gpg/C072C960
new file mode 100644
index 00000000..cf046197
--- /dev/null
+++ b/files/gpg/C072C960
@@ -0,0 +1,25 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQGNBGAyemoBDADMwGfwPLzN0G0TOoiJdboRZOHUk51mtkBemD+JX2XiTvykjj4p
+M5MyRfGKV5YFRw5IkFXqYaNP/dqCAbWkfQG1aNpzPVIqlwwOkNEnNR2dKpiEpiq9
+Q53HbAjMa9eHxvWN65MtvDIXGUIoupVMZAbycsYD9+fZWJrQgRlSb/Lk9cCvYKoy
+dXsfS1TOmglI3yFRgSvr+CM54gIOKpqWJVE+u2ZFq2rw9yh0GQzcOLXmrMStfbla
+akgqe3jpdXKIlI4tSoRaOsIFUjc1DeyZcEJGZyKlo4h1cgVNha8HDiMB9a7bdTCm
+W06ZbUrEz1vTmyFN6WFsLuZ4MRiWkuz0RAA9ePGMYz8DsQoMqusaoFAoQkgJQH4d
+MF+/3MFnK6CXMtkDYqwstcSDqtzbgvW+sOCzA/WGUzw37nwoh+mxIctVPxYsuipT
+aX8O9T449mQ61AOFw9MoTRSnf0XNfFUlkh9fQlUK/BWxM0X7A4UUtdMcZC54LsMF
+KHDCC4WHeOpDy1sAEQEAAbRFQ2xvdWRzbWl0aCBQYWNrYWdlIChyYWJiaXRtcS9y
+YWJiaXRtcS1zZXJ2ZXIpIDxzdXBwb3J0QGNsb3Vkc21pdGguaW8+iQG3BBMBCAAh
+BQJgMnpqAhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEJ9Fh/ImIINCM+4M
+AJmb/bXlShUTN4J1XCSOoUk4rBe0jBb6YbvB0YJrD1FZr/nfwV08sqCxfBvXR41W
+9PwCCPYKUXo1K4TxehfOR4RpiHou+YxnqMiZjLKB9nSTnGj7kSJ8OLEcqUrgV/Uv
+Fk0w2IGQf25u6D6NumKuk6CElFxBG5OzBXtBAxUSLzQ7Xz/3IuqaPuA8KPRD25s8
+yDjj2auyZxlfaD+wUNkqaLQ9quXd8IJuUqvz9wNbOItooWypEk2tX48w5i+wd1pP
+AW+NjKuwd0G88nO6J+7oFYXcsh7n3nblJZT0bmUZC9M6kL9llt8Vy/FBkHnP3dX3
++6EfEXeXPhVJTI7nkNP64XssO4zHg9vQd3rLd6RCfUnA/NjEXvpR6pjoEsPMlD99
+8hsK1c0AhAntSsB2sky7E5p7Rzq8X/SM8aZGDmkitkN2VdnAQsJP0UVq7FnpqBFS
+pMxOxGveS5d5sjU3LoHPTg1uOcARcsOH245szVBPtklXOzg7Fazcc+BHmjYmrgeu
+QQ==
+=CfXb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/releasenotes/notes/rabbit_cloudsmith-36ccc2f807688f4f.yaml b/releasenotes/notes/rabbit_cloudsmith-36ccc2f807688f4f.yaml
new file mode 100644
index 00000000..86d16112
--- /dev/null
+++ b/releasenotes/notes/rabbit_cloudsmith-36ccc2f807688f4f.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    Default source of rabbitmq and erlang packages has been switched to
+    cloudsmith.io
diff --git a/tasks/install_apt.yml b/tasks/install_apt.yml
index c75da5f5..83b46a87 100644
--- a/tasks/install_apt.yml
+++ b/tasks/install_apt.yml
@@ -21,7 +21,7 @@
     apt_package_pinning_priority: 999
     apt_pinned_packages:
       - package: "*"
-        release: "Erlang Solutions Ltd."
+        release: "cloudsmith/rabbitmq/rabbitmq-erlang"
       - package: "erlang*"
         version: "{{ rabbitmq_erlang_version_spec }}"
         priority: 1000
diff --git a/tasks/install_yum.yml b/tasks/install_yum.yml
index aadb7123..f7a0c061 100644
--- a/tasks/install_yum.yml
+++ b/tasks/install_yum.yml
@@ -25,6 +25,7 @@
     description: "{{ item.description }}"
     baseurl: "{{ item.baseurl }}"
     gpgcheck: "{{ item.gpgcheck | default('no') }}"
+    gpgkey: "{{ item.gpgkey | default(omit) }}"
   with_items:
     - "{{ rabbitmq_erlang_repo }}"
     - "{{ rabbitmq_repo }}"
diff --git a/vars/debian.yml b/vars/debian.yml
index df48b742..0c09fa2f 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -17,18 +17,21 @@ _rabbitmq_install_method: external_repo
 _rabbitmq_package_version: "3.9.8-1"
 
 _rabbitmq_gpg_keys:
-  - file: gpg/4D206F89
-  - file: gpg/A14F4FCA
+  - file: gpg/C072C960 # RabbitMQ Cloudsmith repo
+  - file: gpg/A16A4251 # Erlang Cloudsmith repo
+  - file: gpg/0A9AF211 # RabbitMQ Release Signing Key
 
-_rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/{{ ansible_facts['distribution'] | lower }}"
+# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
+
+_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/{{ ansible_facts['distribution'] | lower }}"
 _rabbitmq_repo:
   repo: "deb {{ rabbitmq_repo_url }} {{ ansible_facts['distribution_release'] | lower }} main"
   state: "present"
   filename: "RabbitMQ"
 
-_rabbitmq_erlang_repo_url: "https://packages.erlang-solutions.com/{{ ansible_facts['distribution'] | lower }}"
+_rabbitmq_erlang_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/{{ ansible_facts['distribution'] | lower }}"
 _rabbitmq_erlang_repo:
-  repo: "deb {{ rabbitmq_erlang_repo_url }} {{ ansible_facts['distribution_release'] | lower }} contrib"
+  repo: "deb {{ rabbitmq_erlang_repo_url }} {{ ansible_facts['distribution_release'] | lower }} main"
   state: "present"
   filename: els_erlang
 
diff --git a/vars/redhat.yml b/vars/redhat.yml
index eb1edda6..8c05f74b 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -17,21 +17,31 @@ _rabbitmq_install_method: external_repo
 _rabbitmq_package_version: 3.9.8-1
 _erlang_package_version: 24.1-1
 
-_rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
+# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
+
+_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/rpm/el/{{ ansible_facts['distribution_major_version'] }}/noarch"
 _rabbitmq_repo:
   name: rabbitmq_rabbitmq-server
   description: "RabbitMQ Server Rolling Repository"
   baseurl: "{{ rabbitmq_repo_url }}"
   filename: RabbitMQ
+  gpgcheck: yes
+  gpgkey:
+    - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key
+    - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
 
-_rabbitmq_erlang_repo_url: "https://packagecloud.io/rabbitmq/erlang/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
+_rabbitmq_erlang_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
 _rabbitmq_erlang_repo:
   name: rabbitmq_els-erlang
-  description: "RabbitMQ Erlang Packages from Bintray"
+  description: "RabbitMQ Erlang Packages"
   baseurl: "{{ rabbitmq_erlang_repo_url }}"
   filename: els-erlang
+  gpgcheck: yes
+  gpgkey:
+    - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key
+    - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
 
 rabbitmq_distro_packages:
   - openssl
-  - "erlang-{{ _erlang_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.x86_64"
+  - "erlang-{{ _erlang_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.{{ ansible_facts['architecture'] }}"
   - "rabbitmq-server-{{ rabbitmq_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.noarch"