diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b3a5570c..3d012d337 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,7 @@ jobs:
             make st2
       - restore_cache:
           key: v2-dependency-cache-{{ checksum "st2/requirements.txt" }}
+      - run: sudo apt-get update
       - run: sudo apt install python3-dev
       - run: sudo apt install libldap2-dev 
       - run: sudo apt install libsasl2-dev
diff --git a/docs/source/install/index.rst b/docs/source/install/index.rst
index 042535047..284698d49 100644
--- a/docs/source/install/index.rst
+++ b/docs/source/install/index.rst
@@ -53,7 +53,7 @@ on Ubuntu, or ``sudo yum install curl nss`` on RHEL/RockyLinux/CentOS. Then run
 
 .. code-block:: bash
 
-   bash <(curl -sSL https://stackstorm.com/packages/install.sh) --user=st2admin --password=Ch@ngeMe
+   bash <(curl -sSL https://stackstorm.com/packages/v3.7/install.sh) --user=st2admin --password=Ch@ngeMe
 
 This is an opinionated installation of |st2|. It will download and install all components, as per
 the :doc:`single host reference deployment <./overview>`. It assumes that you have a clean, basic
diff --git a/docs/source/install/rhel8.rst b/docs/source/install/rhel8.rst
index a4720c38c..0e1cd85b6 100644
--- a/docs/source/install/rhel8.rst
+++ b/docs/source/install/rhel8.rst
@@ -81,12 +81,18 @@ Install MongoDB, RabbitMQ, and Redis:
   curl -sL https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | sudo bash
   curl -sL https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | sudo bash
   sudo yum makecache -y --disablerepo='*' --enablerepo='rabbitmq_rabbitmq-server'
-  sudo yum -y install erlang
+  sudo yum -y install erlang-24*
   sudo yum -y install rabbitmq-server
   sudo yum -y install redis
   sudo systemctl start mongod rabbitmq-server redis
   sudo systemctl enable mongod rabbitmq-server redis
 
+.. note::
+
+    RabbitMQ currently only has preview support for Erlang 25, however it is available in the
+    RabbitMQ-Erlang repository. Whilst Erlang 25 support is in preview (https://www.rabbitmq.com/which-erlang.html)
+    it is advised to install the latest Erlang 24 version instead.
+
 
 Setup Repositories
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/source/install/u18.rst b/docs/source/install/u18.rst
index 5af8d2ec8..e379710a1 100644
--- a/docs/source/install/u18.rst
+++ b/docs/source/install/u18.rst
@@ -39,23 +39,30 @@ Install MongoDB, RabbitMQ, and Redis:
   # Add keys latest RabbitMQ and RabbitMQ-erlang
   # Team RabbitMQ's main signing key
   curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/com.rabbitmq.team.gpg > /dev/null
-  # Launchpad PPA that provides modern Erlang releases
-  curl -1sLf "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf77f1eda57ebb1cc" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg > /dev/null
-  # PackageCloud RabbitMQ repository
-  curl -1sLf "https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.packagecloud.rabbitmq.gpg > /dev/null
+  # CloudSmith PPA that provides modern Erlang releases
+  curl -1sLf "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.cloudsmith.dl.rabbitmq.erlang.gpg > /dev/null
+  # CloudSmith RabbitMQ repository
+  curl -1sLf "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.cloudsmith.dl.rabbitmq.gpg > /dev/null
 
   # Add apt repositories maintained by Team RabbitMQ
   sudo tee /etc/apt/sources.list.d/rabbitmq.list <<EOF
 
   ## Provides modern Erlang/OTP releases
   ##
-  deb [signed-by=/usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg] http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main
-  deb-src [signed-by=/usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg] http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main
+  deb [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.erlang.gpg] http://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu ${SUBTYPE} main
+  deb-src [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.erlang.gpg] http://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu ${SUBTYPE} main
 
   ## Provides RabbitMQ
   ##
-  deb [signed-by=/usr/share/keyrings/io.packagecloud.rabbitmq.gpg] https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
-  deb-src [signed-by=/usr/share/keyrings/io.packagecloud.rabbitmq.gpg] https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
+  deb [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.gpg] https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu/ ${SUBTYPE} main
+  deb-src [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.gpg] https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu/ ${SUBTYPE} main
+  EOF
+
+  sudo tee /etc/apt/preferences.d/erlang <<EOF
+  # prefer packages erlang less than 25 repository
+  Package: erlang-*
+  Pin: version 1:24.*
+  Pin-Priority: 800
   EOF
 
   sudo apt-get update
@@ -71,6 +78,13 @@ Install MongoDB, RabbitMQ, and Redis:
   sudo apt-get install rabbitmq-server -y --fix-missing
   sudo apt-get install -y redis-server
 
+.. note::
+
+    RabbitMQ currently only has preview support for Erlang 25, however it is available in the
+    RabbitMQ-Erlang repository. Whilst Erlang 25 support is in preview (https://www.rabbitmq.com/which-erlang.html)
+    it is advised to install the latest Erlang 24 version instead. This is achieved by setting the apt
+    preferences to prioritize erlang 24.
+
 For Ubuntu ``Bionic`` you may need to enable and start MongoDB.
 
 .. code-block:: bash
diff --git a/docs/source/install/u20.rst b/docs/source/install/u20.rst
index b556952f0..e87cb0a13 100644
--- a/docs/source/install/u20.rst
+++ b/docs/source/install/u20.rst
@@ -38,22 +38,29 @@ Install MongoDB, RabbitMQ, and Redis:
   # Add keys latest RabbitMQ and RabbitMQ-erlang
   # Team RabbitMQ's main signing key
   curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/com.rabbitmq.team.gpg > /dev/null
-  # Launchpad PPA that provides modern Erlang releases
-  curl -1sLf "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf77f1eda57ebb1cc" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg > /dev/null
-  # PackageCloud RabbitMQ repository
-  curl -1sLf "https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.packagecloud.rabbitmq.gpg > /dev/null
+  # CloudSmith PPA that provides modern Erlang releases
+  curl -1sLf "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.cloudsmith.dl.rabbitmq.erlang.gpg > /dev/null
+  # CloudSmith RabbitMQ repository
+  curl -1sLf "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.cloudsmith.dl.rabbitmq.gpg > /dev/null
 
   # Add apt repositories maintained by Team RabbitMQ
   sudo tee /etc/apt/sources.list.d/rabbitmq.list <<EOF
   ## Provides modern Erlang/OTP releases
   ##
-  deb [signed-by=/usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg] http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
-  deb-src [signed-by=/usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg] http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
+  deb [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.erlang.gpg] http://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu ${SUBTYPE} main
+  deb-src [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.erlang.gpg] http://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu ${SUBTYPE} main
 
   ## Provides RabbitMQ
   ##
-  deb [signed-by=/usr/share/keyrings/io.packagecloud.rabbitmq.gpg] https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
-  deb-src [signed-by=/usr/share/keyrings/io.packagecloud.rabbitmq.gpg] https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
+  deb [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.gpg] https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu/ ${SUBTYPE} main
+  deb-src [signed-by=/usr/share/keyrings/io.cloudsmith.dl.rabbitmq.gpg] https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu/ ${SUBTYPE} main
+  EOF
+
+  sudo tee /etc/apt/preferences.d/erlang <<EOF
+  # prefer packages erlang less than 25 repository
+  Package: erlang-*
+  Pin: version 1:24.*
+  Pin-Priority: 800
   EOF
 
   sudo apt-get update
@@ -69,6 +76,13 @@ Install MongoDB, RabbitMQ, and Redis:
   sudo apt-get install rabbitmq-server -y --fix-missing
   sudo apt-get install -y redis-server
 
+.. note::
+
+    RabbitMQ currently only has preview support for Erlang 25, however it is available in the
+    RabbitMQ-Erlang repository. Whilst Erlang 25 support is in preview (https://www.rabbitmq.com/which-erlang.html)
+    it is advised to install the latest Erlang 24 version instead. This is achieved by setting the apt
+    preferences to prioritize erlang 24.
+
 For Ubuntu ``Focal`` you may need to enable and start MongoDB.
 
 .. code-block:: bash
diff --git a/docs/source/install/upgrades.rst b/docs/source/install/upgrades.rst
index 0c69e9bc3..c27211722 100644
--- a/docs/source/install/upgrades.rst
+++ b/docs/source/install/upgrades.rst
@@ -178,7 +178,7 @@ v3.7
 
 .. sourcecode:: bash
 
-    sudo st2ctl reload --register-setup-recreate-virtualenvs
+    sudo st2ctl reload --register-recreate-virtualenvs
 
 * As ``_global`` is used for the global overrides file, if your |st2| uses a pack called _global then it will need to be renamed prior to upgrade.
 
@@ -282,7 +282,7 @@ v3.4
 
 .. sourcecode:: bash
 
-    sudo st2ctl reload --register-setup-recreate-virtualenvs
+    sudo st2ctl reload --register-recreate-virtualenvs
 
 
 v3.3
diff --git a/docs/source/rbac.rst b/docs/source/rbac.rst
index 261c1e852..9eeb15863 100644
--- a/docs/source/rbac.rst
+++ b/docs/source/rbac.rst
@@ -32,6 +32,9 @@ roles.
 By default when a new |st2| user is created, this user has no roles assigned to it, meaning it
 doesn't have access to perform any API operation which is behind the RBAC wall.
 
+.. note::
+    ``sensor_service`` is the |st2| user which sensors run as.
+
 Role
 ~~~~
 
diff --git a/docs/source/upgrade_notes.rst b/docs/source/upgrade_notes.rst
index 04dcd8dca..0c41e40b9 100644
--- a/docs/source/upgrade_notes.rst
+++ b/docs/source/upgrade_notes.rst
@@ -8,6 +8,15 @@ Upgrade Notes
 |st2| v3.7
 ----------
 
+* *RockyLinux/RHEL/CentOS 8 only*. Due to the upgrade from python3.6 to python 3.8, all
+  packs installed prior to upgrade will need to have their virtual environment re-created
+  after upgrading |st2| packages (on all nodes which run st2actionrunner or st2sensorcontainer
+  services), using the following command:
+
+  .. sourcecode:: bash
+
+      sudo st2ctl reload --register-recreate-virtualenvs
+
 * API will now set ``Secure`` and ``Samesite=lax`` cookie attribute for the auth cookie which
   is set when authenticating via auth token / API key in query parameter (this approach is
   primarily used by st2web).
@@ -34,6 +43,11 @@ Upgrade Notes
   See :doc:`purging old data documentation <troubleshooting/purging_old_data>` for further
   information.
 
+* As part of extending RBAC support to include protecting access to datastore operations, if
+  you have RBAC enabled and any sensors access the datastore, then the ``sensor_service`` user will
+  need to be assigned an RBAC role with the appropriate key_value_pair permissions.  
+  Further information can be found in the :doc:`RBAC documentation <rbac>`.
+
 .. _ref-upgrade-notes-v3-6:
 
 |st2| v3.6
diff --git a/version.txt b/version.txt
index cafa9424b..475ba515c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.7dev
+3.7