diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4e1c4d4105..dc8d4debd0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -127,9 +127,7 @@ jobs:
       - setup_remote_docker:
           reusable: true    # default - false
           exclusive: true   # default - true
-          # Temporary workaround for Circle CI issue
-          # https://discuss.circleci.com/t/setup-remote-docker-connection-failures/26434
-          version: 18.05.0-ce
+          version: 19.03.14
       - run:
           name: Docker version
           command: |
@@ -176,7 +174,7 @@ jobs:
             docker cp . st2-packages-vol:${ST2_GITDIR}
       - run:
           name: Pull dependent Docker Images
-          command: .circle/docker-compose2.sh pull ${DISTRO}
+          command: .circle/docker-compose2.sh pull ${DISTRO} || .circle/docker-compose2.sh pull ${DISTRO}
           working_directory: ~/st2-packages
       - run:
           name: Build the ${DISTRO} Packages
@@ -186,14 +184,6 @@ jobs:
             mkdir -p ~/st2/packages/${DISTRO}/log/
             docker cp st2-packages-vol:/root/build/. ~/st2/packages/${DISTRO}
           working_directory: ~/st2-packages
-#      # TODO: It works! (~0.5-1min speed-up) Enable CircleCI2.0 cache for pip and wheelhouse later
-#      - run:
-#          name: Build the ${DISTRO} Packages 2nd time (compare with pip/wheelhouse cached)
-#          command: |
-#            .circle/docker-compose2.sh build ${DISTRO}
-#            # Once build container finishes we can copy packages directly from it
-#            docker cp st2-packages-vol:/root/build /tmp/st2-packages
-#          working_directory: ~/st2-packages
       - run:
           name: Test the Packages
           command: .circle/docker-compose2.sh test ${DISTRO}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6cd8eb2f6a..94e83ae58f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,6 +15,9 @@ Fixed
 Added
 ~~~~~
 
+* Minor updates for RockyLinux. #5552
+  Contributed by Amanda McGuinness (@amanda11 intive)
+
 * Added st2 API get action parameters by ref. #5509
 
   API endpoint ``/api/v1/actions/views/parameters/{action_id}`` accepts ``ref_or_id``.
@@ -4244,4 +4247,4 @@ v0.5.1 - November 3rd, 2014
 Added
 ~~~~~
 
-* Initial public release
\ No newline at end of file
+* Initial public release
diff --git a/contrib/linux/actions/service.py b/contrib/linux/actions/service.py
index 70db65773b..0226adeef7 100644
--- a/contrib/linux/actions/service.py
+++ b/contrib/linux/actions/service.py
@@ -69,7 +69,8 @@ def get_linux_distribution():
 elif (
     re.search(distro, "Redhat")
     or re.search(distro, "Fedora")
-    or re.search(distro, "CentOS Linux")
+    or re.search(distro, "CentOS")
+    or re.search(distro, "Rocky Linux")
 ):
     cmd_args = ["systemctl", args["act"], args["service"]]
 
diff --git a/st2common/bin/st2ctl b/st2common/bin/st2ctl
index 4e2ff9a295..0f735aa952 100755
--- a/st2common/bin/st2ctl
+++ b/st2common/bin/st2ctl
@@ -25,7 +25,7 @@ SYSTEMD_RELOADED=""
 # load in environment to allow override of COMPONENTS and ST2_CONF above
 # Ubuntu/Debian
 [ -r /etc/default/st2ctl ] && source /etc/default/st2ctl
-# RHEL/CentOS
+# RHEL/CentOS/Rocky
 [ -r /etc/sysconfig/st2ctl ] && source /etc/sysconfig/st2ctl