diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2c12d95fc2..e6af6007bc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -79,7 +79,7 @@ Added
   to pants' use of PEX lockfiles. This is not a user-facing addition.
   #6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253
   #6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287 #6306 #6307
-  #6311 #6314 #6315 #6317 #6319 #6312 #6320 #6321 #6323 #6324 #6325 #6326
+  #6311 #6314 #6315 #6317 #6319 #6312 #6320 #6321 #6323 #6324 #6325 #6326 #6327
   Contributed by @cognifloyd
 * Build of ST2 EL9 packages #6153
   Contributed by @amanda11
diff --git a/packaging/BUILD b/packaging/BUILD
index 313d5b3ac6..ad9af3e58c 100644
--- a/packaging/BUILD
+++ b/packaging/BUILD
@@ -36,6 +36,8 @@ nfpm_deb_package(
         "./deb/scripts",
         "./deb/systemd:services",
         "./common/systemd:generators",
+        "./common:dirs",
+        "./common:symlinks",
     ],
     scripts=dict(
         preinstall="deb/scripts/pre-install.sh",
@@ -66,6 +68,8 @@ nfpm_rpm_package(
         "./rpm/scripts",
         "./rpm/systemd:services",
         "./common/systemd:generators",
+        "./common:dirs",
+        "./common:symlinks",
     ],
     scripts=dict(
         preinstall="rpm/scripts/pre-install.sh",
diff --git a/packaging/common/BUILD b/packaging/common/BUILD
new file mode 100644
index 0000000000..a707af82ee
--- /dev/null
+++ b/packaging/common/BUILD
@@ -0,0 +1,73 @@
+nfpm_content_dirs(
+    name="root_dirs",
+    dirs=[
+        # "/etc/bash_completion.d",
+        # "/etc/logrotate.d",
+        "/etc/st2",
+        "/opt/stackstorm",
+        "/opt/stackstorm/st2",
+        "/usr/share/doc/st2",
+    ],
+    file_owner="root",
+    file_group="root",
+    file_mode="rwxr-xr-x",
+)
+
+nfpm_content_dirs(
+    name="packs_group_dirs",
+    dirs=[
+        "/opt/stackstorm/packs",
+        "/opt/stackstorm/virtualenvs",
+        "/usr/share/doc/st2/examples",
+    ],
+    file_owner="root",
+    file_group=ST2_PACKS_GROUP,
+    file_mode="rwxrwxr-x",
+)
+
+nfpm_content_dirs(
+    name="st2_user_dirs",
+    dirs=[
+        "/opt/stackstorm/configs",
+        "/opt/stackstorm/exports",
+        "/opt/stackstorm/overrides",
+        "/var/log/st2",
+        "/var/run/st2",
+    ],
+    file_owner=ST2_SVC_USER,
+    file_group="root",
+    file_mode="rwxr-xr-x",
+)
+
+target(
+    name="dirs",
+    dependencies=[
+        ":root_dirs",
+        ":packs_group_dirs",
+        ":st2_user_dirs",
+    ],
+)
+
+nfpm_content_symlinks(
+    name="symlinks",
+    symlinks=[
+        # the symlink src will be made available during post-install script
+        (f"/opt/stackstorm/st2/bin/{cmd}", f"/usr/bin/{cmd}")
+        for cmd in (
+            "st2",
+            "st2-trigger-refire",
+            "st2-rule-tester",
+            "st2-run-pack-tests",
+            "st2-register-content",
+            "st2-apply-rbac-definitions",
+            "st2-bootstrap-rmq",
+            "st2-generate-symmetric-crypto-key",
+            "st2-self-check",
+            "st2-track-result",
+            "st2-validate-pack-config",
+            "st2ctl",
+        )
+    ],
+    file_owner="root",
+    file_group="root",
+)